X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/d2b3bd440d4700abf2e6b503d3a864af1496026e..38c3f5374d3c6305be89b18108fa0bf1de4f4cbd:/src/am7xxx.c diff --git a/src/am7xxx.c b/src/am7xxx.c index 4cfc9a9..d6615ba 100644 --- a/src/am7xxx.c +++ b/src/am7xxx.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "am7xxx.h" #include "serialize.h" @@ -35,6 +36,20 @@ # 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, @@ -62,6 +77,16 @@ static struct am7xxx_usb_device_descriptor supported_devices[] = { .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, @@ -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 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 @@ -91,7 +116,7 @@ typedef enum { AM7XXX_PACKET_TYPE_DEVINFO = 0x01, AM7XXX_PACKET_TYPE_IMAGE = 0x02, AM7XXX_PACKET_TYPE_POWER = 0x04, - AM7XXX_PACKET_TYPE_UNKNOWN = 0x05, + AM7XXX_PACKET_TYPE_ZOOM = 0x05, } am7xxx_packet_type; struct am7xxx_generic_header { @@ -121,6 +146,11 @@ struct am7xxx_power_header { uint32_t bit0; }; +struct am7xxx_zoom_header { + uint32_t bit1; + uint32_t bit0; +}; + /* * Examples of packet headers: * @@ -131,9 +161,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 */ +/* 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; - uint8_t unknown0; + uint8_t direction; uint8_t header_data_len; uint8_t unknown2; uint8_t unknown3; @@ -142,75 +176,91 @@ struct am7xxx_header { struct am7xxx_devinfo_header devinfo; struct am7xxx_image_header image; struct am7xxx_power_header power; + struct am7xxx_zoom_header zoom; } header_data; }; -static void dump_devinfo_header(struct am7xxx_devinfo_header *d) +#ifdef DEBUG +static void debug_dump_devinfo_header(am7xxx_context *ctx, struct am7xxx_devinfo_header *d) { - if (d == NULL) + if (ctx == NULL || d == NULL) return; - printf("Info header:\n"); - printf("\tnative_width: 0x%08x (%u)\n", d->native_width, d->native_width); - printf("\tnative_height: 0x%08x (%u)\n", d->native_height, d->native_height); - printf("\tunknown0: 0x%08x (%u)\n", d->unknown0, d->unknown0); - printf("\tunknown1: 0x%08x (%u)\n", d->unknown1, d->unknown1); + debug(ctx, "Info header:\n"); + debug(ctx, "\tnative_width: 0x%08x (%u)\n", d->native_width, d->native_width); + debug(ctx, "\tnative_height: 0x%08x (%u)\n", d->native_height, d->native_height); + debug(ctx, "\tunknown0: 0x%08x (%u)\n", d->unknown0, d->unknown0); + debug(ctx, "\tunknown1: 0x%08x (%u)\n", d->unknown1, d->unknown1); } -static void dump_image_header(struct am7xxx_image_header *i) +static void debug_dump_image_header(am7xxx_context *ctx, struct am7xxx_image_header *i) { - if (i == NULL) + if (ctx == NULL || i == NULL) return; - printf("Image header:\n"); - printf("\tformat: 0x%08x (%u)\n", i->format, i->format); - printf("\twidth: 0x%08x (%u)\n", i->width, i->width); - printf("\theight: 0x%08x (%u)\n", i->height, i->height); - printf("\timage size: 0x%08x (%u)\n", i->image_size, i->image_size); + debug(ctx, "Image header:\n"); + debug(ctx, "\tformat: 0x%08x (%u)\n", i->format, i->format); + debug(ctx, "\twidth: 0x%08x (%u)\n", i->width, i->width); + debug(ctx, "\theight: 0x%08x (%u)\n", i->height, i->height); + debug(ctx, "\timage size: 0x%08x (%u)\n", i->image_size, i->image_size); } -static void dump_power_header(struct am7xxx_power_header *p) +static void debug_dump_power_header(am7xxx_context *ctx, struct am7xxx_power_header *p) { - if (p == NULL) + if (ctx == NULL || p == NULL) return; - printf("Power header:\n"); - printf("\tbit2: 0x%08x (%u)\n", p->bit2, p->bit2); - printf("\tbit1: 0x%08x (%u)\n", p->bit1, p->bit1); - printf("\tbit0: 0x%08x (%u)\n", p->bit0, p->bit0); + debug(ctx, "Power header:\n"); + debug(ctx, "\tbit2: 0x%08x (%u)\n", p->bit2, p->bit2); + debug(ctx, "\tbit1: 0x%08x (%u)\n", p->bit1, p->bit1); + debug(ctx, "\tbit0: 0x%08x (%u)\n", p->bit0, p->bit0); } -static void dump_header(struct am7xxx_header *h) +static void debug_dump_zoom_header(am7xxx_context *ctx, struct am7xxx_zoom_header *z) { - if (h == NULL) + if (ctx == NULL || z == NULL) return; - printf("packet_type: 0x%08x (%u)\n", h->packet_type, h->packet_type); - printf("unknown0: 0x%02hhx (%hhu)\n", h->unknown0, h->unknown0); - printf("header_data_len: 0x%02hhx (%hhu)\n", h->header_data_len, h->header_data_len); - printf("unknown2: 0x%02hhx (%hhu)\n", h->unknown2, h->unknown2); - printf("unknown3: 0x%02hhx (%hhu)\n", h->unknown3, h->unknown3); + debug(ctx, "Zoom header:\n"); + debug(ctx, "\tbit1: 0x%08x (%u)\n", z->bit1, z->bit1); + debug(ctx, "\tbit0: 0x%08x (%u)\n", z->bit0, z->bit0); +} + +static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h) +{ + if (ctx == NULL || h == NULL) + return; + + debug(ctx, "BEGIN\n"); + debug(ctx, "packet_type: 0x%08x (%u)\n", h->packet_type, h->packet_type); + 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); switch(h->packet_type) { case AM7XXX_PACKET_TYPE_DEVINFO: - dump_devinfo_header(&(h->header_data.devinfo)); + debug_dump_devinfo_header(ctx, &(h->header_data.devinfo)); break; case AM7XXX_PACKET_TYPE_IMAGE: - dump_image_header(&(h->header_data.image)); + debug_dump_image_header(ctx, &(h->header_data.image)); break; case AM7XXX_PACKET_TYPE_POWER: - dump_power_header(&(h->header_data.power)); + debug_dump_power_header(ctx, &(h->header_data.power)); + break; + + case AM7XXX_PACKET_TYPE_ZOOM: + debug_dump_zoom_header(ctx, &(h->header_data.zoom)); break; default: - printf("Packet type not supported!\n"); + debug(ctx, "Packet type not supported!\n"); break; } - - fflush(stdout); + debug(ctx, "END\n\n"); } static inline unsigned int in_80chars(unsigned int i) @@ -220,36 +270,56 @@ static inline unsigned int in_80chars(unsigned int i) return ((i+1) % (80/3)); } -static void dump_buffer(uint8_t *buffer, unsigned int len) +static void trace_dump_buffer(am7xxx_context *ctx, const char *message, + uint8_t *buffer, unsigned int len) { unsigned int i; - if (buffer == NULL || len == 0) + if (ctx == NULL || buffer == NULL || len == 0) return; + trace(ctx, "\n"); + if (message) + trace(ctx, "%s\n", message); + for (i = 0; i < len; i++) { - printf("%02hhX%c", buffer[i], (in_80chars(i) && (i < len - 1)) ? ' ' : '\n'); + trace(ctx, "%02hhX%c", buffer[i], (in_80chars(i) && (i < len - 1)) ? ' ' : '\n'); } - fflush(stdout); + trace(ctx, "\n"); +} +#else +static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h) +{ + (void)ctx; + (void)h; } +static void trace_dump_buffer(am7xxx_context *ctx, const char *message, + uint8_t *buffer, unsigned int len) +{ + (void)ctx; + (void)message; + (void)buffer; + (void)len; +} +#endif /* DEBUG */ + static int read_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len) { int ret; int transferred = 0; ret = libusb_bulk_transfer(dev->usb_device, 0x81, buffer, len, &transferred, 0); - if (ret != 0 || (unsigned int)transferred != len) { - fprintf(stderr, "Error: ret: %d\ttransferred: %d (expected %u)\n", - ret, transferred, len); + if (ret < 0) { + error(dev->ctx, "USB bulk transfer failed (%s)\n", libusb_error_name(ret)); + return ret; + } else if (ret != 0 || (unsigned int)transferred != len) { + error(dev->ctx, "ret: %d\ttransferred: %d (expected %u)\n", + ret, transferred, len); return ret; } -#if DEBUG - printf("\n<-- received\n"); - dump_buffer(buffer, len); - printf("\n"); -#endif + trace_dump_buffer(dev->ctx, "<-- received", buffer, len); return 0; } @@ -259,16 +329,15 @@ static int send_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len) int ret; int transferred = 0; -#if DEBUG - printf("\nsending -->\n"); - dump_buffer(buffer, len); - printf("\n"); -#endif + trace_dump_buffer(dev->ctx, "sending -->", buffer, len); - ret = libusb_bulk_transfer(dev->usb_device, 1, buffer, len, &transferred, 0); - if (ret != 0 || (unsigned int)transferred != len) { - fprintf(stderr, "Error: ret: %d\ttransferred: %d (expected %u)\n", - ret, transferred, len); + ret = libusb_bulk_transfer(dev->usb_device, 0x1, buffer, len, &transferred, 0); + if (ret < 0) { + error(dev->ctx, "USB bulk transfer failed (%s)\n", libusb_error_name(ret)); + return ret; + } else if (ret != 0 || (unsigned int)transferred != len) { + error(dev->ctx, "ret: %d\ttransferred: %d (expected %u)\n", + ret, transferred, len); return ret; } @@ -280,7 +349,7 @@ static void serialize_header(struct am7xxx_header *h, uint8_t *buffer) 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); @@ -295,7 +364,7 @@ static void unserialize_header(uint8_t *buffer, struct am7xxx_header *h) 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); @@ -315,13 +384,15 @@ static int read_header(am7xxx_device *dev, struct am7xxx_header *h) unserialize_header(dev->buffer, h); -#if DEBUG - printf("\n"); - dump_header(h); - printf("\n"); -#endif + 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; @@ -331,16 +402,12 @@ static int send_header(am7xxx_device *dev, struct am7xxx_header *h) { int ret; -#if DEBUG - printf("\n"); - dump_header(h); - printf("\n"); -#endif + debug_dump_header(dev->ctx, h); serialize_header(h, dev->buffer); ret = send_data(dev, dev->buffer, AM7XXX_HEADER_WIRE_SIZE); if (ret < 0) - fprintf(stderr, "send_header: failed to send data.\n"); + error(dev->ctx, "failed to send data\n"); return ret; } @@ -380,7 +447,7 @@ static am7xxx_device *add_new_device(am7xxx_context *ctx) am7xxx_device *new_device; if (ctx == NULL) { - fprintf(stderr, "%s: context must not be NULL!\n", __func__); + fatal("context must not be NULL!\n"); return NULL; } @@ -388,7 +455,7 @@ static am7xxx_device *add_new_device(am7xxx_context *ctx) new_device = malloc(sizeof(*new_device)); if (new_device == NULL) { - perror("malloc"); + fatal("cannot allocate a new device (%s)\n", strerror(errno)); return NULL; } memset(new_device, 0, sizeof(*new_device)); @@ -413,7 +480,7 @@ static am7xxx_device *find_device(am7xxx_context *ctx, am7xxx_device *current; if (ctx == NULL) { - fprintf(stderr, "%s: context must not be NULL!\n", __func__); + fatal("context must not be NULL!\n"); return NULL; } @@ -440,7 +507,7 @@ typedef enum { * device with index 'open_device_index' and returns the correspondent * am7xxx_device in the 'dev' parameter; the function returns 0 on success, * 1 if the device was already open and a negative value on error. - * + * * NOTES: * if scan_devices() fails when called with 'op' == SCAN_OP_BUILD_DEVLIST, * the caller might want to call am7xxx_shutdown() in order to remove @@ -456,16 +523,17 @@ static int scan_devices(am7xxx_context *ctx, scan_op op, int ret; if (ctx == NULL) { - fprintf(stderr, "%s: context must not be NULL!\n", __func__); + fatal("context must not be NULL!\n"); return -EINVAL; } if (op == SCAN_OP_BUILD_DEVLIST && ctx->devices_list != NULL) { - fprintf(stderr, "%s: device scan done already? Abort!\n", __func__); + error(ctx, "device scan done already? Abort!\n"); return -EINVAL; } num_devices = libusb_get_device_list(ctx->usb_context, &list); if (num_devices < 0) { + error(ctx, "USB get device list failed (%s)\n", libusb_error_name(num_devices)); ret = -ENODEV; goto out; } @@ -476,8 +544,10 @@ static int scan_devices(am7xxx_context *ctx, scan_op op, unsigned int j; ret = libusb_get_device_descriptor(list[i], &desc); - if (ret < 0) + if (ret < 0) { + debug(ctx, "USB get device descriptor failed (%s)\n", libusb_error_name(ret)); continue; + } for (j = 0; j < ARRAY_SIZE(supported_devices); j++) { if (desc.idVendor == supported_devices[j].vendor_id @@ -485,10 +555,9 @@ static int scan_devices(am7xxx_context *ctx, scan_op op, if (op == SCAN_OP_BUILD_DEVLIST) { am7xxx_device *new_device; - /* debug */ - printf("am7xxx device found, index: %d, name: %s\n", - current_index, - supported_devices[j].name); + info(ctx, "am7xxx device found, index: %d, name: %s\n", + current_index, + supported_devices[j].name); new_device = add_new_device(ctx); if (new_device == NULL) { /* XXX, the caller may want @@ -496,6 +565,7 @@ static int scan_devices(am7xxx_context *ctx, scan_op op, * we fail here, as we may have * added some devices already */ + debug(ctx, "Cannot create a new device\n"); ret = -ENODEV; goto out; } @@ -510,15 +580,18 @@ static int scan_devices(am7xxx_context *ctx, scan_op op, /* the usb device has already been opened */ if ((*dev)->usb_device) { + debug(ctx, "(*dev)->usb_device already set\n"); ret = 1; goto out; } ret = libusb_open(list[i], &((*dev)->usb_device)); - if (ret < 0) + if (ret < 0) { + debug(ctx, "libusb_open failed (%s)\n", libusb_error_name(ret)); 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; } @@ -529,6 +602,7 @@ static int scan_devices(am7xxx_context *ctx, scan_op op, /* if we made it up to here we didn't find any device to open */ if (op == SCAN_OP_OPEN_DEVICE) { + error(ctx, "Cannot find any device to open\n"); ret = -ENODEV; goto out; } @@ -540,13 +614,15 @@ out: return ret; } -int am7xxx_init(am7xxx_context **ctx) +/* Public API */ + +AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx) { int ret = 0; *ctx = malloc(sizeof(**ctx)); if (*ctx == NULL) { - perror("malloc"); + fatal("cannot allocate the context (%s)\n", strerror(errno)); ret = -ENOMEM; goto out; } @@ -556,14 +632,16 @@ int am7xxx_init(am7xxx_context **ctx) (*ctx)->log_level = AM7XXX_LOG_TRACE; ret = libusb_init(&((*ctx)->usb_context)); - if (ret < 0) + if (ret < 0) { + fatal("USB initialization failed (%s)\n", libusb_error_name(ret)); goto out_free_context; + } libusb_set_debug((*ctx)->usb_context, 3); ret = scan_devices(*ctx, SCAN_OP_BUILD_DEVLIST , 0, NULL); if (ret < 0) { - fprintf(stderr, "%s: scan_devices failed\n", __func__); + error(*ctx, "scan_devices() failed\n"); am7xxx_shutdown(*ctx); goto out; } @@ -579,12 +657,12 @@ out: return ret; } -void am7xxx_shutdown(am7xxx_context *ctx) +AM7XXX_PUBLIC void am7xxx_shutdown(am7xxx_context *ctx) { am7xxx_device *current; if (ctx == NULL) { - fprintf(stderr, "%s: context must not be NULL!\n", __func__); + fatal("context must not be NULL!\n"); return; } @@ -601,18 +679,18 @@ void am7xxx_shutdown(am7xxx_context *ctx) 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; } -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; if (ctx == NULL) { - fprintf(stderr, "%s: context must not be NULL!\n", __func__); + fatal("context must not be NULL!\n"); return -EINVAL; } @@ -620,8 +698,7 @@ int am7xxx_open_device(am7xxx_context *ctx, am7xxx_device **dev, if (ret < 0) { errno = ENODEV; } else if (ret > 0) { - /* warning */ - fprintf(stderr, "%s: device %d already open\n", __func__, device_index); + warning(ctx, "device %d already open\n", device_index); errno = EBUSY; ret = -EBUSY; } @@ -629,10 +706,10 @@ int am7xxx_open_device(am7xxx_context *ctx, am7xxx_device **dev, return ret; } -int am7xxx_close_device(am7xxx_device *dev) +AM7XXX_PUBLIC int am7xxx_close_device(am7xxx_device *dev) { if (dev == NULL) { - fprintf(stderr, "%s: dev must not be NULL!\n", __func__); + fatal("dev must not be NULL!\n"); return -EINVAL; } if (dev->usb_device) { @@ -643,16 +720,13 @@ int am7xxx_close_device(am7xxx_device *dev) return 0; } -int am7xxx_get_device_info(am7xxx_device *dev, - unsigned int *native_width, - unsigned int *native_height, - unsigned int *unknown0, - unsigned int *unknown1) +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, - .unknown0 = 0x00, + .direction = AM7XXX_DIRECTION_OUT, .header_data_len = 0x00, .unknown2 = 0x3e, .unknown3 = 0x10, @@ -674,25 +748,90 @@ int am7xxx_get_device_info(am7xxx_device *dev, if (ret < 0) return ret; - *native_width = h.header_data.devinfo.native_width; - *native_height = h.header_data.devinfo.native_height; - *unknown0 = h.header_data.devinfo.unknown0; - *unknown1 = h.header_data.devinfo.unknown1; + device_info->native_width = h.header_data.devinfo.native_width; + device_info->native_height = h.header_data.devinfo.native_height; +#if 0 + /* No reason to expose these in the public API until we know what they mean */ + device_info->unknown0 = h.header_data.devinfo.unknown0; + device_info->unknown1 = h.header_data.devinfo.unknown1; +#endif + + return 0; +} + +AM7XXX_PUBLIC int am7xxx_calc_scaled_image_dimensions(am7xxx_device *dev, + unsigned int upscale, + unsigned int original_width, + unsigned int original_height, + unsigned int *scaled_width, + unsigned int *scaled_height) +{ + + am7xxx_device_info device_info; + float width_ratio; + float height_ratio; + int ret; + + ret = am7xxx_get_device_info(dev, &device_info); + if (ret < 0) { + error(dev->ctx, "cannot get device info\n"); + return ret; + } + + /* + * Check if we need to rescale; if the input image fits the native + * dimensions there is no need to, unless we want to upscale. + */ + if (!upscale && + original_width <= device_info.native_width && + original_height <= device_info.native_height ) { + debug(dev->ctx, "CASE 0, no rescaling, the original image fits already\n"); + *scaled_width = original_width; + *scaled_height = original_height; + return 0; + } + + /* Input dimensions relative to the device native dimensions */ + width_ratio = (float)original_width / device_info.native_width; + height_ratio = (float)original_height / device_info.native_height; + + if (width_ratio > height_ratio) { + /* + * The input is proportionally "wider" than the device viewport + * so its height needs to be adjusted + */ + debug(dev->ctx, "CASE 1, original image wider, adjust the scaled height\n"); + *scaled_width = device_info.native_width; + *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"); + *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_width = device_info.native_width; + *scaled_height = device_info.native_height; + } + debug(dev->ctx, "scaled dimensions: %dx%d\n", *scaled_width, *scaled_height); 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, uint8_t *image, - unsigned int size) + unsigned int image_size) { 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, @@ -701,7 +840,7 @@ int am7xxx_send_image(am7xxx_device *dev, .format = format, .width = width, .height = height, - .image_size = size, + .image_size = image_size, }, }, }; @@ -710,24 +849,26 @@ int am7xxx_send_image(am7xxx_device *dev, if (ret < 0) return ret; - if (image == NULL || size == 0) + if (image == NULL || image_size == 0) { + warning(dev->ctx, "Not sending any data, check the 'image' or 'image_size' parameters\n"); return 0; + } - return send_data(dev, 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 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, }; - switch(mode) { + switch(power) { case AM7XXX_POWER_OFF: h.header_data.power.bit2 = 0; h.header_data.power.bit1 = 0; @@ -738,6 +879,7 @@ int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mode) h.header_data.power.bit2 = 0; h.header_data.power.bit1 = 0; h.header_data.power.bit0 = 1; + break; case AM7XXX_POWER_MIDDLE: h.header_data.power.bit2 = 0; @@ -758,7 +900,51 @@ int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mode) break; default: - fprintf(stderr, "Unsupported power mode.\n"); + error(dev->ctx, "Unsupported power mode.\n"); + return -EINVAL; + }; + + ret = send_header(dev, &h); + if (ret < 0) + return ret; + + return 0; +} + +AM7XXX_PUBLIC int am7xxx_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom) +{ + int ret; + struct am7xxx_header h = { + .packet_type = AM7XXX_PACKET_TYPE_ZOOM, + .direction = AM7XXX_DIRECTION_OUT, + .header_data_len = sizeof(struct am7xxx_zoom_header), + .unknown2 = 0x3e, + .unknown3 = 0x10, + }; + + switch(zoom) { + case AM7XXX_ZOOM_ORIGINAL: + h.header_data.zoom.bit1 = 0; + h.header_data.zoom.bit0 = 0; + break; + + case AM7XXX_ZOOM_H: + h.header_data.zoom.bit1 = 0; + h.header_data.zoom.bit0 = 1; + break; + + case AM7XXX_ZOOM_H_V: + h.header_data.zoom.bit1 = 1; + h.header_data.zoom.bit0 = 0; + break; + + case AM7XXX_ZOOM_TEST: + h.header_data.zoom.bit1 = 1; + h.header_data.zoom.bit0 = 1; + break; + + default: + error(dev->ctx, "Unsupported zoom mode.\n"); return -EINVAL; };