From d9b0524a108bb57ecc5e05fde9077c5cc5c3c077 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Tue, 21 Feb 2012 13:19:28 +0100 Subject: [PATCH] am7xxx: change am7xx_device definition, better buffer handling Add a new data type for am7xxx devices and make it hold a buffer, this way allocating a new buffer for each communication can be avoided; also move this definition to am7xxx.c to avoid exposing details about libusb in am7xxx.h. --- src/am7xxx.c | 88 +++++++++++++++++++++++++++-------------------------- src/am7xxx.h | 15 +++++---- src/libam7xxx.pc.in | 2 +- src/picoproj.c | 2 +- 4 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/am7xxx.c b/src/am7xxx.c index c02b539..c5ec753 100644 --- a/src/am7xxx.c +++ b/src/am7xxx.c @@ -18,7 +18,9 @@ #include #include +#include #include +#include #include "am7xxx.h" #include "serialize.h" @@ -26,6 +28,17 @@ #define AM7XXX_VENDOR_ID 0x1de1 #define AM7XXX_PRODUCT_ID 0xc101 +/* The header size on the wire is known to be always 24 bytes, regardless of + * the memory configuration enforced by different architechtures or compilers + * for struct am7xxx_header + */ +#define AM7XXX_HEADER_WIRE_SIZE 24 + +struct _am7xxx_device { + libusb_device_handle *usb_device; + uint8_t buffer[AM7XXX_HEADER_WIRE_SIZE]; +}; + typedef enum { AM7XXX_PACKET_TYPE_DEVINFO = 0x01, AM7XXX_PACKET_TYPE_IMAGE = 0x02, @@ -70,12 +83,6 @@ 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 */ -/* The header size on the wire is known to be always 24 bytes, regardless of - * the memory configuration enforced by different architechtures or compilers - * for struct am7xxx_header - */ -#define AM7XXX_HEADER_WIRE_SIZE 24 - struct am7xxx_header { uint32_t packet_type; uint8_t unknown0; @@ -178,12 +185,12 @@ static void dump_buffer(uint8_t *buffer, unsigned int len) fflush(stdout); } -static int read_data(am7xxx_device dev, uint8_t *buffer, unsigned int len) +static int read_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len) { int ret; int transferred = 0; - ret = libusb_bulk_transfer(dev, 0x81, buffer, len, &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); @@ -199,7 +206,7 @@ static int read_data(am7xxx_device dev, uint8_t *buffer, unsigned int len) return 0; } -static int send_data(am7xxx_device dev, uint8_t *buffer, unsigned int len) +static int send_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len) { int ret; int transferred = 0; @@ -210,7 +217,7 @@ static int send_data(am7xxx_device dev, uint8_t *buffer, unsigned int len) printf("\n"); #endif - ret = libusb_bulk_transfer(dev, 1, buffer, len, &transferred, 0); + 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); @@ -250,22 +257,15 @@ static void unserialize_header(uint8_t *buffer, struct am7xxx_header *h) h->header_data.data.field3 = get_le32(buffer_iterator); } -static int read_header(am7xxx_device dev, struct am7xxx_header *h) +static int read_header(am7xxx_device *dev, struct am7xxx_header *h) { - uint8_t *buffer; int ret; - buffer = calloc(AM7XXX_HEADER_WIRE_SIZE, 1); - if (buffer == NULL) { - perror("calloc buffer"); - return -ENOMEM; - } - - ret = read_data(dev, buffer, AM7XXX_HEADER_WIRE_SIZE); + ret = read_data(dev, dev->buffer, AM7XXX_HEADER_WIRE_SIZE); if (ret < 0) goto out; - unserialize_header(buffer, h); + unserialize_header(dev->buffer, h); #if DEBUG printf("\n"); @@ -276,13 +276,11 @@ static int read_header(am7xxx_device dev, struct am7xxx_header *h) ret = 0; out: - free(buffer); return ret; } -static int send_header(am7xxx_device dev, struct am7xxx_header *h) +static int send_header(am7xxx_device *dev, struct am7xxx_header *h) { - uint8_t *buffer; int ret; #if DEBUG @@ -291,56 +289,60 @@ static int send_header(am7xxx_device dev, struct am7xxx_header *h) printf("\n"); #endif - buffer = calloc(AM7XXX_HEADER_WIRE_SIZE, 1); - if (buffer == NULL) { - perror("calloc buffer"); - return -ENOMEM; - } - - serialize_header(h, buffer); - ret = send_data(dev, buffer, AM7XXX_HEADER_WIRE_SIZE); + 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"); - free(buffer); return ret; } -am7xxx_device am7xxx_init(void) +am7xxx_device *am7xxx_init(void) { - am7xxx_device dev; + unsigned int i; + + am7xxx_device *dev = malloc(sizeof(*dev)); + if (dev == NULL) { + perror("malloc"); + goto out; + } + memset(dev, 0, sizeof(*dev)); libusb_init(NULL); libusb_set_debug(NULL, 3); - dev = libusb_open_device_with_vid_pid(NULL, + dev->usb_device = libusb_open_device_with_vid_pid(NULL, AM7XXX_VENDOR_ID, AM7XXX_PRODUCT_ID); - if (dev == NULL) { + if (dev->usb_device == NULL) { errno = ENODEV; perror("libusb_open_device_with_vid_pid"); goto out_libusb_exit; } - libusb_set_configuration(dev, 1); - libusb_claim_interface(dev, 0); + libusb_set_configuration(dev->usb_device, 1); + libusb_claim_interface(dev->usb_device, 0); return dev; out_libusb_exit: libusb_exit(NULL); + free(dev); +out: return NULL; } -void am7xxx_shutdown(am7xxx_device dev) +void am7xxx_shutdown(am7xxx_device *dev) { if (dev) { - libusb_close(dev); + libusb_close(dev->usb_device); libusb_exit(NULL); + free(dev); + dev = NULL; } } -int am7xxx_get_device_info(am7xxx_device dev, +int am7xxx_get_device_info(am7xxx_device *dev, unsigned int *native_width, unsigned int *native_height, unsigned int *unknown0, @@ -379,7 +381,7 @@ int am7xxx_get_device_info(am7xxx_device dev, return 0; } -int am7xxx_send_image(am7xxx_device dev, +int am7xxx_send_image(am7xxx_device *dev, am7xxx_image_format format, unsigned int width, unsigned int height, @@ -413,7 +415,7 @@ int am7xxx_send_image(am7xxx_device dev, return send_data(dev, image, size); } -int am7xxx_set_power_mode(am7xxx_device dev, am7xxx_power_mode mode) +int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mode) { int ret; struct am7xxx_header h = { diff --git a/src/am7xxx.h b/src/am7xxx.h index e30057b..5367145 100644 --- a/src/am7xxx.h +++ b/src/am7xxx.h @@ -19,13 +19,12 @@ #ifndef __AM7XXX_H #define __AM7XXX_H -#include - #ifdef __cplusplus extern "C" { #endif -typedef libusb_device_handle *am7xxx_device; +struct _am7xxx_device; +typedef struct _am7xxx_device am7xxx_device; typedef enum { AM7XXX_IMAGE_FORMAT_JPEG = 1, @@ -40,17 +39,17 @@ typedef enum { AM7XXX_POWER_TURBO = 4, } am7xxx_power_mode; -am7xxx_device am7xxx_init(void); +am7xxx_device *am7xxx_init(void); -void am7xxx_shutdown(am7xxx_device dev); +void am7xxx_shutdown(am7xxx_device *dev); -int am7xxx_get_device_info(am7xxx_device dev, +int am7xxx_get_device_info(am7xxx_device *dev, unsigned int *native_width, unsigned int *native_height, unsigned int *unknown0, unsigned int *unknown1); -int am7xxx_send_image(am7xxx_device dev, +int am7xxx_send_image(am7xxx_device *dev, am7xxx_image_format format, unsigned int width, unsigned int height, @@ -63,7 +62,7 @@ int am7xxx_send_image(am7xxx_device dev, * * Remember to mention that when writing the API doc. */ -int am7xxx_set_power_mode(am7xxx_device dev, am7xxx_power_mode mode); +int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mode); #ifdef __cplusplus } diff --git a/src/libam7xxx.pc.in b/src/libam7xxx.pc.in index 2ad2256..dff65c6 100644 --- a/src/libam7xxx.pc.in +++ b/src/libam7xxx.pc.in @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: @PROJECT_NAME@ Description: @PROJECT_DESCRIPTION@ -Requires: libusb-1.0 +Requires.private: libusb-1.0 Version: @PROJECT_APIVER@ Libs: -L${libdir} -lam7xxx Cflags: -I${includedir} diff --git a/src/picoproj.c b/src/picoproj.c index f8eb5bc..cc31714 100644 --- a/src/picoproj.c +++ b/src/picoproj.c @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) char filename[FILENAME_MAX] = {0}; int image_fd; struct stat st; - am7xxx_device dev; + am7xxx_device *dev; int format = AM7XXX_IMAGE_FORMAT_JPEG; int width = 800; int height = 480; -- 2.1.4