X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/759559da7fb9c03e5f42eab12acbc01ebe763186..8f6efd04b7f47174cf9e93adbcd11c5779db0c7e:/src/am7xxx.c

diff --git a/src/am7xxx.c b/src/am7xxx.c
index 76b997c..f874469 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -1,6 +1,6 @@
 /* am7xxx - communication with AM7xxx based USB Pico Projectors and DPFs
  *
- * Copyright (C) 2012  Antonio Ospite <ospite@studenti.unina.it>
+ * Copyright (C) 2012-2014  Antonio Ospite <ao2@ao2.it>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 
 #include "am7xxx.h"
 #include "serialize.h"
+#include "tools.h"
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
@@ -79,7 +80,9 @@ struct am7xxx_usb_device_descriptor {
 };
 
 static int default_set_power_mode(am7xxx_device *dev, am7xxx_power_mode power);
+static int picopix_set_power_mode(am7xxx_device *dev, am7xxx_power_mode power);
 static int default_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom);
+static int picopix_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom);
 
 #define DEFAULT_OPS { \
 	.set_power_mode = default_set_power_mode, \
@@ -125,6 +128,10 @@ static const struct am7xxx_usb_device_descriptor supported_devices[] = {
 		.product_id = 0x0016,
 		.configuration    = 2,
 		.interface_number = 0,
+		.ops = {
+			.set_power_mode = picopix_set_power_mode,
+			.set_zoom_mode = picopix_set_zoom_mode,
+		},
 	},
 	{
 		.name       = "Philips/Sagemcom PicoPix 2330",
@@ -163,6 +170,11 @@ typedef enum {
 	AM7XXX_PACKET_TYPE_IMAGE   = 0x02,
 	AM7XXX_PACKET_TYPE_POWER   = 0x04,
 	AM7XXX_PACKET_TYPE_ZOOM    = 0x05,
+	AM7XXX_PACKET_TYPE_PICOPIX_POWER_LOW    = 0x15,
+	AM7XXX_PACKET_TYPE_PICOPIX_POWER_MEDIUM = 0x16,
+	AM7XXX_PACKET_TYPE_PICOPIX_POWER_HIGH   = 0x17,
+	AM7XXX_PACKET_TYPE_PICOPIX_ENABLE_TI    = 0x18,
+	AM7XXX_PACKET_TYPE_PICOPIX_DISABLE_TI   = 0x19,
 } am7xxx_packet_type;
 
 struct am7xxx_generic_header {
@@ -820,7 +832,8 @@ out_libusb_close:
 		}
 	}
 
-	/* if we made it up to here we didn't find any device to open */
+	/* if we made it up to here when op == SCAN_OP_OPEN_DEVICE,
+	 * no devices to open had been found. */
 	if (op == SCAN_OP_OPEN_DEVICE) {
 		error(ctx, "Cannot find any device to open\n");
 		ret = -ENODEV;
@@ -890,6 +903,26 @@ static int default_set_power_mode(am7xxx_device *dev, am7xxx_power_mode power)
 	return 0;
 }
 
+static int picopix_set_power_mode(am7xxx_device *dev, am7xxx_power_mode power)
+{
+	switch(power) {
+	case AM7XXX_POWER_LOW:
+		return send_command(dev, AM7XXX_PACKET_TYPE_PICOPIX_POWER_LOW);
+
+	case AM7XXX_POWER_MIDDLE:
+		return send_command(dev, AM7XXX_PACKET_TYPE_PICOPIX_POWER_MEDIUM);
+
+	case AM7XXX_POWER_HIGH:
+		return send_command(dev, AM7XXX_PACKET_TYPE_PICOPIX_POWER_HIGH);
+
+	case AM7XXX_POWER_OFF:
+	case AM7XXX_POWER_TURBO:
+	default:
+		error(dev->ctx, "Unsupported power mode.\n");
+		return -EINVAL;
+	};
+}
+
 static int default_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom)
 {
 	int ret;
@@ -922,6 +955,7 @@ static int default_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom)
 		h.header_data.zoom.bit0 = 1;
 		break;
 
+	case AM7XXX_ZOOM_TELE:
 	default:
 		error(dev->ctx, "Unsupported zoom mode.\n");
 		return -EINVAL;
@@ -934,6 +968,41 @@ static int default_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom)
 	return 0;
 }
 
+static int picopix_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom)
+{
+	int ret;
+	am7xxx_packet_type packet_type;
+
+	switch(zoom) {
+	case AM7XXX_ZOOM_ORIGINAL:
+		packet_type = AM7XXX_PACKET_TYPE_PICOPIX_DISABLE_TI;
+		break;
+
+	case AM7XXX_ZOOM_TELE:
+		packet_type = AM7XXX_PACKET_TYPE_PICOPIX_ENABLE_TI;
+		break;
+
+	case AM7XXX_ZOOM_H:
+	case AM7XXX_ZOOM_H_V:
+	case AM7XXX_ZOOM_TEST:
+	default:
+		error(dev->ctx, "Unsupported zoom mode.\n");
+		return -EINVAL;
+	};
+
+	ret = send_command(dev, packet_type);
+	if (ret < 0)
+		return ret;
+
+	/* The Windows drivers wait for 100ms and send the same command again,
+	 * probably to overcome a firmware deficiency */
+	ret = msleep(100);
+	if (ret < 0)
+		return ret;
+
+	return send_command(dev, packet_type);
+}
+
 /* Public API */
 
 AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx)
@@ -1060,7 +1129,7 @@ AM7XXX_PUBLIC int am7xxx_get_device_info(am7xxx_device *dev,
 			   am7xxx_device_info *device_info)
 {
 	int ret;
-	struct am7xxx_header h = { 0 };
+	struct am7xxx_header h;
 
 	if (dev->device_info) {
 		memcpy(device_info, dev->device_info, sizeof(*device_info));
@@ -1071,6 +1140,7 @@ AM7XXX_PUBLIC int am7xxx_get_device_info(am7xxx_device *dev,
 	if (ret < 0)
 		return ret;
 
+	memset(&h, 0, sizeof(h));
 	ret = read_header(dev, &h);
 	if (ret < 0)
 		return ret;