X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/d52698283cc0fe225a0d87c68e38969c35d1c9b2..38c3f5374d3c6305be89b18108fa0bf1de4f4cbd:/src/am7xxx.c?ds=sidebyside

diff --git a/src/am7xxx.c b/src/am7xxx.c
index ae6de0f..d6615ba 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -82,6 +82,11 @@ static struct am7xxx_usb_device_descriptor supported_devices[] = {
 		.product_id = 0x5501,
 	},
 	{
+		.name       ="Aiptek PocketCinema T25",
+		.vendor_id  = 0x08ca,
+		.product_id = 0x2144,
+	},
+	{
 		.name       = "Philips/Sagemcom PicoPix 1020",
 		.vendor_id  = 0x21e7,
 		.product_id = 0x000e,
@@ -111,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 {
@@ -141,6 +146,11 @@ struct am7xxx_power_header {
 	uint32_t bit0;
 };
 
+struct am7xxx_zoom_header {
+	uint32_t bit1;
+	uint32_t bit0;
+};
+
 /*
  * Examples of packet headers:
  *
@@ -151,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;
@@ -162,6 +176,7 @@ 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;
 };
 
@@ -202,6 +217,16 @@ static void debug_dump_power_header(am7xxx_context *ctx, struct am7xxx_power_hea
 	debug(ctx, "\tbit0: 0x%08x (%u)\n", p->bit0, p->bit0);
 }
 
+static void debug_dump_zoom_header(am7xxx_context *ctx, struct am7xxx_zoom_header *z)
+{
+	if (ctx == NULL || z == NULL)
+		return;
+
+	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)
@@ -209,7 +234,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, "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);
@@ -227,6 +252,10 @@ static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h)
 		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:
 		debug(ctx, "Packet type not supported!\n");
 		break;
@@ -281,7 +310,10 @@ static int read_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
 	int transferred = 0;
 
 	ret = libusb_bulk_transfer(dev->usb_device, 0x81, buffer, len, &transferred, 0);
-	if (ret != 0 || (unsigned int)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;
@@ -300,7 +332,10 @@ static int send_data(am7xxx_device *dev, uint8_t *buffer, unsigned int len)
 	trace_dump_buffer(dev->ctx, "sending -->", buffer, len);
 
 	ret = libusb_bulk_transfer(dev->usb_device, 0x1, buffer, len, &transferred, 0);
-	if (ret != 0 || (unsigned int)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;
@@ -314,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);
@@ -329,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);
@@ -351,7 +386,13 @@ static int read_header(am7xxx_device *dev, struct am7xxx_header *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;
@@ -492,6 +533,7 @@ static int scan_devices(am7xxx_context *ctx, scan_op op,
 
 	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;
 	}
@@ -502,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
@@ -543,7 +587,7 @@ static int scan_devices(am7xxx_context *ctx, scan_op op,
 
 					ret = libusb_open(list[i], &((*dev)->usb_device));
 					if (ret < 0) {
-						debug(ctx, "libusb_open failed\n");
+						debug(ctx, "libusb_open failed (%s)\n", libusb_error_name(ret));
 						goto out;
 					}
 
@@ -588,8 +632,10 @@ AM7XXX_PUBLIC 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);
 
@@ -680,7 +726,7 @@ AM7XXX_PUBLIC int am7xxx_get_device_info(am7xxx_device *dev,
 	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,
@@ -785,7 +831,7 @@ AM7XXX_PUBLIC int am7xxx_send_image(am7xxx_device *dev,
 	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,
@@ -811,18 +857,18 @@ AM7XXX_PUBLIC int am7xxx_send_image(am7xxx_device *dev,
 	return send_data(dev, image, image_size);
 }
 
-AM7XXX_PUBLIC 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;
@@ -833,6 +879,7 @@ AM7XXX_PUBLIC int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mo
 		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;
@@ -853,7 +900,51 @@ AM7XXX_PUBLIC int am7xxx_set_power_mode(am7xxx_device *dev, am7xxx_power_mode mo
 		break;
 
 	default:
-		error(dev->ctx, "Power mode not supported!\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;
 	};