am7xxx: clean up the exit path in open_device()

[libam7xxx.git] / src / am7xxx.c

diff --git a/src/am7xxx.c b/src/am7xxx.c
index 4ac2461..fedf11a 100644 (file)
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -1,6 +1,6 @@
 /* am7xxx - communication with AM7xxx based USB Pico Projectors and DPFs
  *
 /* 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
  *
  * 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 "am7xxx.h"
 #include "serialize.h"

+#include "tools.h"

 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 


@@ -81,6 +82,7 @@ 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 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, \
 
 #define DEFAULT_OPS { \
        .set_power_mode = default_set_power_mode, \


@@ -128,6 +130,7 @@ static const struct am7xxx_usb_device_descriptor supported_devices[] = {
                .interface_number = 0,
                .ops = {
                        .set_power_mode = picopix_set_power_mode,
                .interface_number = 0,
                .ops = {
                        .set_power_mode = picopix_set_power_mode,

+                       .set_zoom_mode = picopix_set_zoom_mode,

                },
        },
        {
                },
        },
        {


@@ -170,6 +173,8 @@ typedef enum {
        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_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 {
 } am7xxx_packet_type;
 
 struct am7xxx_generic_header {


@@ -697,6 +702,62 @@ static am7xxx_device *find_device(am7xxx_context *ctx,
        return current;
 }
 
        return current;
 }
 

+static int open_device(am7xxx_context *ctx,
+                      unsigned int device_index,
+                      libusb_device* usb_dev,
+                      am7xxx_device **dev)
+{
+       int ret;
+
+       *dev = find_device(ctx, device_index);
+       if (*dev == NULL) {
+               ret = -ENODEV;
+               goto out;
+       }
+
+       /* 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(usb_dev, &((*dev)->usb_device));
+       if (ret < 0) {
+               debug(ctx, "libusb_open failed\n");
+               goto out;
+       }
+
+       /* XXX, the device is now open, if any of the calls below fail we need
+        * to close it again before bailing out.
+        */
+
+       ret = libusb_set_configuration((*dev)->usb_device,
+                                      (*dev)->desc->configuration);
+       if (ret < 0) {
+               debug(ctx, "libusb_set_configuration failed\n");
+               debug(ctx, "Cannot set configuration %hhu\n",
+                     (*dev)->desc->configuration);
+               goto out_libusb_close;
+       }
+
+       ret = libusb_claim_interface((*dev)->usb_device,
+                                    (*dev)->desc->interface_number);
+       if (ret < 0) {
+               debug(ctx, "libusb_claim_interface failed\n");
+               debug(ctx, "Cannot claim interface %hhu\n",
+                     (*dev)->desc->interface_number);
+               goto out_libusb_close;
+       }
+out:
+       return ret;
+
+out_libusb_close:
+       libusb_close((*dev)->usb_device);
+       (*dev)->usb_device = NULL;
+       return ret;
+}
+

 typedef enum {
        SCAN_OP_BUILD_DEVLIST,
        SCAN_OP_OPEN_DEVICE,
 typedef enum {
        SCAN_OP_BUILD_DEVLIST,
        SCAN_OP_OPEN_DEVICE,


@@ -775,51 +836,16 @@ static int scan_devices(am7xxx_context *ctx, scan_op op,
                                } else if (op == SCAN_OP_OPEN_DEVICE &&
                                           current_index == open_device_index) {
 
                                } else if (op == SCAN_OP_OPEN_DEVICE &&
                                           current_index == open_device_index) {
 

-                                       *dev = find_device(ctx, open_device_index);
-                                       if (*dev == NULL) {
-                                               ret = -ENODEV;
-                                               goto out;
-                                       }
-
-                                       /* 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) {
-                                               debug(ctx, "libusb_open failed\n");
-                                               goto out;
-                                       }
-
-                                       /* XXX, the device is now open, if any
-                                        * of the calls below fail we need to
-                                        * close it again before bailing out.
-                                        */
-
-                                       ret = libusb_set_configuration((*dev)->usb_device,
-                                                                      (*dev)->desc->configuration);
-                                       if (ret < 0) {
-                                               debug(ctx, "libusb_set_configuration failed\n");
-                                               debug(ctx, "Cannot set configuration %hhu\n",
-                                                     (*dev)->desc->configuration);
-                                               goto out_libusb_close;
-                                       }
-
-                                       ret = libusb_claim_interface((*dev)->usb_device,
-                                                                    (*dev)->desc->interface_number);
-                                       if (ret < 0) {
-                                               debug(ctx, "libusb_claim_interface failed\n");
-                                               debug(ctx, "Cannot claim interface %hhu\n",
-                                                     (*dev)->desc->interface_number);
-out_libusb_close:
-                                               libusb_close((*dev)->usb_device);
-                                               (*dev)->usb_device = NULL;
-                                               goto out;
-                                       }
+                                       ret = open_device(ctx,
+                                                         open_device_index,
+                                                         list[i],
+                                                         dev);
+                                       if (ret < 0)
+                                               debug(ctx, "open_device failed\n");

 
 

+                                       /* exit the loop unconditionally after
+                                        * attempting to open the device
+                                        * requested by the user */

                                        goto out;
                                }
                                current_index++;
                                        goto out;
                                }
                                current_index++;


@@ -827,7 +853,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;
        if (op == SCAN_OP_OPEN_DEVICE) {
                error(ctx, "Cannot find any device to open\n");
                ret = -ENODEV;


@@ -949,6 +976,7 @@ static int default_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom)
                h.header_data.zoom.bit0 = 1;
                break;
 
                h.header_data.zoom.bit0 = 1;
                break;
 

+       case AM7XXX_ZOOM_TELE:

        default:
                error(dev->ctx, "Unsupported zoom mode.\n");
                return -EINVAL;
        default:
                error(dev->ctx, "Unsupported zoom mode.\n");
                return -EINVAL;


@@ -961,6 +989,41 @@ static int default_set_zoom_mode(am7xxx_device *dev, am7xxx_zoom_mode zoom)
        return 0;
 }
 
        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)
 /* Public API */
 
 AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx)


@@ -1087,7 +1150,7 @@ AM7XXX_PUBLIC int am7xxx_get_device_info(am7xxx_device *dev,
                           am7xxx_device_info *device_info)
 {
        int ret;
                           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));
 
        if (dev->device_info) {
                memcpy(device_info, dev->device_info, sizeof(*device_info));


@@ -1098,6 +1161,7 @@ AM7XXX_PUBLIC int am7xxx_get_device_info(am7xxx_device *dev,
        if (ret < 0)
                return ret;
 
        if (ret < 0)
                return ret;
 

+       memset(&h, 0, sizeof(h));

        ret = read_header(dev, &h);
        if (ret < 0)
                return ret;
        ret = read_header(dev, &h);
        if (ret < 0)
                return ret;