contrib: add other supported devices to 55-am7xxx.rules

[libam7xxx.git] / src / am7xxx.c

diff --git a/src/am7xxx.c b/src/am7xxx.c
index a8bcc49..e5427ca 100644 (file)
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -22,6 +22,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <libusb.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <libusb.h>

+#include <math.h>

 
 #include "am7xxx.h"
 #include "serialize.h"
 
 #include "am7xxx.h"
 #include "serialize.h"


@@ -35,6 +36,20 @@
 #  define  __attribute__(x)  /*NOTHING*/
 #endif
 
 #  define  __attribute__(x)  /*NOTHING*/
 #endif
 

+/* Control shared library symbols visibility */
+#if defined _WIN32 || defined __CYGWIN__
+       #define AM7XXX_PUBLIC __declspec(dllexport)
+       #define AM7XXX_LOCAL
+#else
+       #if __GNUC__ >= 4
+               #define AM7XXX_PUBLIC __attribute__ ((visibility ("default")))
+               #define AM7XXX_LOCAL  __attribute__ ((visibility ("hidden")))
+       #else
+               #define AM7XXX_PUBLIC
+               #define AM7XXX_LOCAL
+       #endif
+#endif
+

 static void log_message(am7xxx_context *ctx,
                        int level,
                        const char *function,
 static void log_message(am7xxx_context *ctx,
                        int level,
                        const char *function,


@@ -62,6 +77,16 @@ static struct am7xxx_usb_device_descriptor supported_devices[] = {
                .product_id = 0xc101,
        },
        {
                .product_id = 0xc101,
        },
        {

+               .name       = "Acer C112",
+               .vendor_id  = 0x1de1,
+               .product_id = 0x5501,
+       },
+       {
+               .name       ="Aiptek PocketCinema T25",
+               .vendor_id  = 0x08ca,
+               .product_id = 0x2144,
+       },
+       {

                .name       = "Philips/Sagemcom PicoPix 1020",
                .vendor_id  = 0x21e7,
                .product_id = 0x000e,
                .name       = "Philips/Sagemcom PicoPix 1020",
                .vendor_id  = 0x21e7,
                .product_id = 0x000e,


@@ -69,7 +94,7 @@ static struct am7xxx_usb_device_descriptor supported_devices[] = {
 };
 
 /* The header size on the wire is known to be always 24 bytes, regardless of
 };
 
 /* The header size on the wire is known to be always 24 bytes, regardless of

- * the memory configuration enforced by different architechtures or compilers
+ * the memory configuration enforced by different architectures or compilers

  * for struct am7xxx_header
  */
 #define AM7XXX_HEADER_WIRE_SIZE 24
  * for struct am7xxx_header
  */
 #define AM7XXX_HEADER_WIRE_SIZE 24


@@ -131,9 +156,13 @@ struct am7xxx_power_header {
  * 04 00 00 00 00 0c ff ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  */
 
  * 04 00 00 00 00 0c ff ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  */
 

+/* Direction of the communication from the host point of view */
+#define AM7XXX_DIRECTION_OUT 0 /* host -> device */
+#define AM7XXX_DIRECTION_IN  1 /* host <- device */
+

 struct am7xxx_header {
        uint32_t packet_type;
 struct am7xxx_header {
        uint32_t packet_type;

-       uint8_t unknown0;
+       uint8_t direction;

        uint8_t header_data_len;
        uint8_t unknown2;
        uint8_t unknown3;
        uint8_t header_data_len;
        uint8_t unknown2;
        uint8_t unknown3;


@@ -189,7 +218,7 @@ static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h)
 
        debug(ctx, "BEGIN\n");
        debug(ctx, "packet_type:     0x%08x (%u)\n", h->packet_type, h->packet_type);
 
        debug(ctx, "BEGIN\n");
        debug(ctx, "packet_type:     0x%08x (%u)\n", h->packet_type, h->packet_type);

-       debug(ctx, "unknown0:        0x%02hhx (%hhu)\n", h->unknown0, h->unknown0);
+       debug(ctx, "direction:       0x%02hhx (%hhu)\n", h->direction, h->direction);

        debug(ctx, "header_data_len: 0x%02hhx (%hhu)\n", h->header_data_len, h->header_data_len);
        debug(ctx, "unknown2:        0x%02hhx (%hhu)\n", h->unknown2, h->unknown2);
        debug(ctx, "unknown3:        0x%02hhx (%hhu)\n", h->unknown3, h->unknown3);
        debug(ctx, "header_data_len: 0x%02hhx (%hhu)\n", h->header_data_len, h->header_data_len);
        debug(ctx, "unknown2:        0x%02hhx (%hhu)\n", h->unknown2, h->unknown2);
        debug(ctx, "unknown3:        0x%02hhx (%hhu)\n", h->unknown3, h->unknown3);


@@ -244,6 +273,7 @@ static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h)
        (void)ctx;
        (void)h;
 }
        (void)ctx;
        (void)h;
 }

+

 static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
                              uint8_t *buffer, unsigned int len)
 {
 static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
                              uint8_t *buffer, unsigned int len)
 {


@@ -278,7 +308,7 @@ static int send_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
 
        trace_dump_buffer(dev->ctx, "sending -->", buffer, len);
 
 
        trace_dump_buffer(dev->ctx, "sending -->", buffer, len);
 

-       ret = libusb_bulk_transfer(dev->usb_device, 1, buffer, len, &transferred, 0);
+       ret = libusb_bulk_transfer(dev->usb_device, 0x1, buffer, len, &transferred, 0);

        if (ret != 0 || (unsigned int)transferred != len) {
                error(dev->ctx, "ret: %d\ttransferred: %d (expected %u)\n",
                      ret, transferred, len);
        if (ret != 0 || (unsigned int)transferred != len) {
                error(dev->ctx, "ret: %d\ttransferred: %d (expected %u)\n",
                      ret, transferred, len);


@@ -293,7 +323,7 @@ static void serialize_header(struct am7xxx_header *h, uint8_t *buffer)
        uint8_t **buffer_iterator = &buffer;
 
        put_le32(h->packet_type, buffer_iterator);
        uint8_t **buffer_iterator = &buffer;
 
        put_le32(h->packet_type, buffer_iterator);

-       put_8(h->unknown0, buffer_iterator);
+       put_8(h->direction, buffer_iterator);

        put_8(h->header_data_len, buffer_iterator);
        put_8(h->unknown2, buffer_iterator);
        put_8(h->unknown3, buffer_iterator);
        put_8(h->header_data_len, buffer_iterator);
        put_8(h->unknown2, buffer_iterator);
        put_8(h->unknown3, buffer_iterator);


@@ -308,7 +338,7 @@ static void unserialize_header(uint8_t *buffer, struct am7xxx_header *h)
        uint8_t **buffer_iterator = &buffer;
 
        h->packet_type = get_le32(buffer_iterator);
        uint8_t **buffer_iterator = &buffer;
 
        h->packet_type = get_le32(buffer_iterator);

-       h->unknown0 = get_8(buffer_iterator);
+       h->direction = get_8(buffer_iterator);

        h->header_data_len = get_8(buffer_iterator);
        h->unknown2 = get_8(buffer_iterator);
        h->unknown3 = get_8(buffer_iterator);
        h->header_data_len = get_8(buffer_iterator);
        h->unknown2 = get_8(buffer_iterator);
        h->unknown3 = get_8(buffer_iterator);


@@ -330,7 +360,13 @@ static int read_header(am7xxx_device *dev, struct am7xxx_header *h)
 
        debug_dump_header(dev->ctx, h);
 
 
        debug_dump_header(dev->ctx, h);
 

-       ret = 0;
+       if (h->direction == AM7XXX_DIRECTION_IN) {
+               ret = 0;
+       } else {
+               error(dev->ctx,
+                     "Received a packet with direction AM7XXX_DIRECTION_OUT, weird!\n");
+               ret = -EINVAL;
+       }

 
 out:
        return ret;
 
 out:
        return ret;


@@ -526,7 +562,7 @@ static int scan_devices(am7xxx_context *ctx, scan_op op,
                                                goto out;
                                        }
 
                                                goto out;
                                        }
 

-                                       libusb_set_configuration((*dev)->usb_device, 1);
+                                       libusb_set_configuration((*dev)->usb_device, 2);

                                        libusb_claim_interface((*dev)->usb_device, 0);
                                        goto out;
                                }
                                        libusb_claim_interface((*dev)->usb_device, 0);
                                        goto out;
                                }


@@ -549,7 +585,9 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-int am7xxx_init(am7xxx_context **ctx)
+/* Public API */
+
+AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx)

 {
        int ret = 0;
 
 {
        int ret = 0;
 


@@ -588,7 +626,7 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-void am7xxx_shutdown(am7xxx_context *ctx)
+AM7XXX_PUBLIC void am7xxx_shutdown(am7xxx_context *ctx)

 {
        am7xxx_device *current;
 
 {
        am7xxx_device *current;
 


@@ -610,12 +648,12 @@ void am7xxx_shutdown(am7xxx_context *ctx)
        ctx = NULL;
 }
 
        ctx = NULL;
 }
 

-void am7xxx_set_log_level(am7xxx_context *ctx, am7xxx_log_level log_level)
+AM7XXX_PUBLIC void am7xxx_set_log_level(am7xxx_context *ctx, am7xxx_log_level log_level)

 {
        ctx->log_level = log_level;
 }
 
 {
        ctx->log_level = log_level;
 }
 

-int am7xxx_open_device(am7xxx_context *ctx, am7xxx_device **dev,
+AM7XXX_PUBLIC int am7xxx_open_device(am7xxx_context *ctx, am7xxx_device **dev,

                       unsigned int device_index)
 {
        int ret;
                       unsigned int device_index)
 {
        int ret;


@@ -637,7 +675,7 @@ int am7xxx_open_device(am7xxx_context *ctx, am7xxx_device **dev,
        return ret;
 }
 
        return ret;
 }
 

-int am7xxx_close_device(am7xxx_device *dev)
+AM7XXX_PUBLIC int am7xxx_close_device(am7xxx_device *dev)

 {
        if (dev == NULL) {
                fatal("dev must not be NULL!\n");
 {
        if (dev == NULL) {
                fatal("dev must not be NULL!\n");


@@ -651,13 +689,13 @@ int am7xxx_close_device(am7xxx_device *dev)
        return 0;
 }
 
        return 0;
 }
 

-int am7xxx_get_device_info(am7xxx_device *dev,
+AM7XXX_PUBLIC int am7xxx_get_device_info(am7xxx_device *dev,

                           am7xxx_device_info *device_info)
 {
        int ret;
        struct am7xxx_header h = {
                .packet_type     = AM7XXX_PACKET_TYPE_DEVINFO,
                           am7xxx_device_info *device_info)
 {
        int ret;
        struct am7xxx_header h = {
                .packet_type     = AM7XXX_PACKET_TYPE_DEVINFO,

-               .unknown0        = 0x00,
+               .direction       = AM7XXX_DIRECTION_OUT,

                .header_data_len = 0x00,
                .unknown2        = 0x3e,
                .unknown3        = 0x10,
                .header_data_len = 0x00,
                .unknown2        = 0x3e,
                .unknown3        = 0x10,


@@ -690,7 +728,7 @@ int am7xxx_get_device_info(am7xxx_device *dev,
        return 0;
 }
 
        return 0;
 }
 

-int am7xxx_calc_scaled_image_dimensions(am7xxx_device *dev,
+AM7XXX_PUBLIC int am7xxx_calc_scaled_image_dimensions(am7xxx_device *dev,

                                        unsigned int upscale,
                                        unsigned int original_width,
                                        unsigned int original_height,
                                        unsigned int upscale,
                                        unsigned int original_width,
                                        unsigned int original_height,


@@ -733,14 +771,14 @@ int am7xxx_calc_scaled_image_dimensions(am7xxx_device *dev,
                 */
                debug(dev->ctx, "CASE 1, original image wider, adjust the scaled height\n");
                *scaled_width = device_info.native_width;
                 */
                debug(dev->ctx, "CASE 1, original image wider, adjust the scaled height\n");
                *scaled_width = device_info.native_width;

-               *scaled_height = (unsigned int)(original_height / width_ratio);
+               *scaled_height = (unsigned int)lroundf(original_height / width_ratio);

        } else if (width_ratio < height_ratio) {
                /*
                 * The input is proportionally "taller" than the device viewport
                 * so its width needs to be adjusted
                 */
                debug(dev->ctx, "CASE 2 original image taller, adjust the scaled width\n");
        } else if (width_ratio < height_ratio) {
                /*
                 * The input is proportionally "taller" than the device viewport
                 * so its width needs to be adjusted
                 */
                debug(dev->ctx, "CASE 2 original image taller, adjust the scaled width\n");

-               *scaled_width = (unsigned int)(original_width / height_ratio);
+               *scaled_width = (unsigned int)lroundf(original_width / height_ratio);

                *scaled_height = device_info.native_height;
        } else {
                debug(dev->ctx, "CASE 3, just rescale, same aspect ratio already\n");
                *scaled_height = device_info.native_height;
        } else {
                debug(dev->ctx, "CASE 3, just rescale, same aspect ratio already\n");


@@ -752,7 +790,7 @@ int am7xxx_calc_scaled_image_dimensions(am7xxx_device *dev,
        return 0;
 }
 
        return 0;
 }
 

-int am7xxx_send_image(am7xxx_device *dev,
+AM7XXX_PUBLIC int am7xxx_send_image(am7xxx_device *dev,

                      am7xxx_image_format format,
                      unsigned int width,
                      unsigned int height,
                      am7xxx_image_format format,
                      unsigned int width,
                      unsigned int height,


@@ -762,7 +800,7 @@ int am7xxx_send_image(am7xxx_device *dev,
        int ret;
        struct am7xxx_header h = {
                .packet_type     = AM7XXX_PACKET_TYPE_IMAGE,
        int ret;
        struct am7xxx_header h = {
                .packet_type     = AM7XXX_PACKET_TYPE_IMAGE,

-               .unknown0        = 0x00,
+               .direction       = AM7XXX_DIRECTION_OUT,

                .header_data_len = sizeof(struct am7xxx_image_header),
                .unknown2        = 0x3e,
                .unknown3        = 0x10,
                .header_data_len = sizeof(struct am7xxx_image_header),
                .unknown2        = 0x3e,
                .unknown3        = 0x10,


@@ -788,12 +826,12 @@ int am7xxx_send_image(am7xxx_device *dev,
        return send_data(dev, image, image_size);
 }
 
        return send_data(dev, image, image_size);
 }
 

-int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mode)
+AM7XXX_PUBLIC int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mode)

 {
        int ret;
        struct am7xxx_header h = {
                .packet_type     = AM7XXX_PACKET_TYPE_POWER,
 {
        int ret;
        struct am7xxx_header h = {
                .packet_type     = AM7XXX_PACKET_TYPE_POWER,

-               .unknown0        = 0x00,
+               .direction       = AM7XXX_DIRECTION_OUT,

                .header_data_len = sizeof(struct am7xxx_power_header),
                .unknown2        = 0x3e,
                .unknown3        = 0x10,
                .header_data_len = sizeof(struct am7xxx_power_header),
                .unknown2        = 0x3e,
                .unknown3        = 0x10,