Update libmtp from pre 1.1.4 git to 1.1.5 release.

src/libusb-glue.c

 /*
  * \file libusb-glue.c
  * Low-level USB interface glue towards libusb.
  *
  * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
  * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2006-2007 Marcus Meissner
  * Copyright (C) 2007 Ted Bullock
  * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com>
  *
@@ skipping 82 matching lines @@
 static const LIBMTP_device_entry_t mtp_device_table[] = {
 /* We include an .h file which is shared between us and libgphoto2 */
 #include "music-players.h"
 };
 static const int mtp_device_table_size = sizeof(mtp_device_table) / sizeof(LIBMTP_device_entry_t);
 
 // Local functions
 static struct usb_bus* init_usb();
 static void close_usb(PTP_USB* ptp_usb);
 static int find_interface_and_endpoints(struct usb_device *dev,
+                                        uint8_t *conf,
                                         uint8_t *interface,
+                                        uint8_t *altsetting,
                                         int* inep,
                                         int* inep_maxpacket,
                                         int* outep,
                                         int* outep_maxpacket,
                                         int* intep);
 static void clear_stall(PTP_USB* ptp_usb);
-static int init_ptp_usb (PTPParams* params, PTP_USB* ptp_usb, struct usb_device* dev);
-static short ptp_write_func (unsigned long,PTPDataHandler*,void *data,unsigned long*);
-static short ptp_read_func (unsigned long,PTPDataHandler*,void *data,unsigned long*,int);
+static int init_ptp_usb(PTPParams* params, PTP_USB* ptp_usb, struct usb_device* dev);
+static short ptp_write_func(unsigned long,PTPDataHandler*,void *data,unsigned long*);
+static short ptp_read_func(unsigned long,PTPDataHandler*,void *data,unsigned long*,int);
 static int usb_clear_stall_feature(PTP_USB* ptp_usb, int ep);
 static int usb_get_endpoint_status(PTP_USB* ptp_usb, int ep, uint16_t* status);
 
 /**
  * Get a list of the supported USB devices.
  *
  * The developers depend on users of this library to constantly
  * add in to the list of supported devices. What we need is the
  * device name, USB Vendor ID (VID) and USB Product ID (PID).
  * put this into a bug ticket at the project homepage, please.
@@ skipping 1492 matching lines @@
                               USB_TYPE_CLASS | USB_RECIP_INTERFACE,
                               0x64, 0x0000, 0x0000,
                               (char *) buffer,
                               sizeof(buffer),
                               ptp_usb->timeout);
         if (ret < sizeof(buffer))
                 return PTP_ERROR_IO;
         return PTP_RC_OK;
 }
 
-static int init_ptp_usb (PTPParams* params, PTP_USB* ptp_usb, struct usb_device* dev)
+static int init_ptp_usb(PTPParams* params, PTP_USB* ptp_usb, struct usb_device* dev)
 {
   usb_dev_handle *device_handle;
   char buf[255];
   int usbresult;
 
   params->sendreq_func=ptp_usb_sendreq;
   params->senddata_func=ptp_usb_senddata;
   params->getresp_func=ptp_usb_getresp;
   params->getdata_func=ptp_usb_getdata;
   params->cancelreq_func=ptp_usb_control_cancel_request;
   params->data=ptp_usb;
   params->transaction_id=0;
   /*
    * This is hardcoded here since we have no devices whatsoever that are BE.
    * Change this the day we run into our first BE device (if ever).
    */
   params->byteorder = PTP_DL_LE;
 
   ptp_usb->timeout = get_timeout(ptp_usb);
 
   device_handle = usb_open(dev);
   if (!device_handle) {
     perror("usb_open()");
     return -1;
   }
   ptp_usb->handle = device_handle;
+
 #ifdef LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
   /*
    * If this device is known to be wrongfully claimed by other kernel
    * drivers (such as mass storage), then try to unload it to make it
    * accessible from user space.
    */
   if (FLAG_UNLOAD_DRIVER(ptp_usb)) {
     if (usb_get_driver_np(device_handle, (int) ptp_usb->interface,
                           buf, sizeof(buf)) == 0) {
       if (usb_detach_kernel_driver_np(device_handle,
                                       (int) ptp_usb->interface)) {
         perror("usb_detach_kernel_driver_np()");
         return -1;
       }
     }
   }
 #endif
-#ifdef __WIN32__
-  // Only needed on Windows, and cause problems on other platforms.
-  if (usb_set_configuration(device_handle, dev->config->bConfigurationValue)) {
-    perror("usb_set_configuration()");
-    return -1;
+
+  /*
+   * Check if the config is set to something else than what we want
+   * to use. Only set the configuration if we absolutely have to.
+   * Also do not bail out if we fail.
+   */
+  if (dev->config->bConfigurationValue != ptp_usb->config) {
+    if (usb_set_configuration(device_handle, dev->config->bConfigurationValue)) {
+      perror("error in usb_set_configuration()- continuing anyway");
+    }
   }
-#endif
-  // It seems like on kernel 2.6.31 if we already have it open on another
-  // pthread in our app, we'll get an error if we try to claim it again,
-  // but that error is harmless because our process already claimed the interface
+
+  /*
+   * It seems like on kernel 2.6.31 if we already have it open on another
+   * pthread in our app, we'll get an error if we try to claim it again,
+   * but that error is harmless because our process already claimed the interface
+   */
   usbresult = usb_claim_interface(device_handle, (int) ptp_usb->interface);
 
   if (usbresult != 0)
     fprintf(stderr, "ignoring usb_claim_interface = %d", usbresult);
 
-  // FIXME : Discovered in the Barry project
-  // kernels >= 2.6.28 don't set the interface the same way as
-  // previous versions did, and the Blackberry gets confused
-  // if it isn't explicitly set
-  // See above, same issue with pthreads means that if this fails it is not
-  // fatal
-  // However, this causes problems on Macs so disable here
+  /*
+   * If the altsetting is set to something different than we want, switch
+   * it.
+   *
+   * FIXME: this seems to cause trouble on the Mac:s so disable it. Retry
+   * this on the Mac now that it only sets this when the altsetting differs.
+   */
 #ifndef __APPLE__
-  usbresult = usb_set_altinterface(device_handle, 0);
-  if (usbresult)
-    fprintf(stderr, "ignoring usb_claim_interface = %d", usbresult);
+#if 0 /* Disable this always, no idea on how to handle it */
+  if (dev->config->interface[].altsetting[] !=
+      ptp_usb->altsetting) {
+    fprintf(stderr, "desired altsetting different from current, trying to set altsetting\n");
+    usbresult = usb_set_altinterface(device_handle, 0);
+    if (usbresult)
+      fprintf(stderr, "ignoring error from usb_claim_interface = %d\n", usbresult);
+  }
+#endif
 #endif
 
   if (FLAG_SWITCH_MODE_BLACKBERRY(ptp_usb)) {
     int ret;
 
     // FIXME : Only for BlackBerry Storm
     // What does it mean? Maybe switch mode...
     // This first control message is absolutely necessary
     usleep(1000);
     ret = usb_control_msg(device_handle,
@@ skipping 115 matching lines @@
      */
     usb_reset(ptp_usb->handle);
   }
   usb_close(ptp_usb->handle);
 }
 
 /**
  * Self-explanatory?
  */
 static int find_interface_and_endpoints(struct usb_device *dev,
+                                        uint8_t *conf,
                                         uint8_t *interface,
+                                        uint8_t *altsetting,
                                         int* inep,
                                         int* inep_maxpacket,
                                         int* outep,
                                         int *outep_maxpacket,
                                         int* intep)
 {
-  int i;
+  uint8_t i;
 
   // Loop over the device configurations
   for (i = 0; i < dev->descriptor.bNumConfigurations; i++) {
     uint8_t j;
 
+    *conf = dev->config->bConfigurationValue;;
+
     // Loop over each configurations interfaces
     for (j = 0; j < dev->config[i].bNumInterfaces; j++) {
-      uint8_t k;
+      uint8_t k, l;
       uint8_t no_ep;
       int found_inep = 0;
       int found_outep = 0;
       int found_intep = 0;
       struct usb_endpoint_descriptor *ep;
 
-      // MTP devices shall have 3 endpoints, ignore those interfaces
-      // that haven't.
-      no_ep = dev->config[i].interface[j].altsetting->bNumEndpoints;
-      if (no_ep != 3)
-        continue;
+      // Inspect the altsettings of this interface
+      for (k = 0; k < dev->config[i].interface[j].num_altsetting; k++) {
 
-      *interface = dev->config[i].interface[j].altsetting->bInterfaceNumber;
-      ep = dev->config[i].interface[j].altsetting->endpoint;
+        // MTP devices shall have 3 endpoints, ignore those interfaces
+        // that haven't.
+        no_ep = dev->config[i].interface[j].altsetting[k].bNumEndpoints;
+        if (no_ep != 3)
+          continue;
 
-      // Loop over the three endpoints to locate two bulk and
-      // one interrupt endpoint and FAIL if we cannot, and continue.
-      for (k = 0; k < no_ep; k++) {
-        if (ep[k].bmAttributes == USB_ENDPOINT_TYPE_BULK) {
-          if ((ep[k].bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
-              USB_ENDPOINT_DIR_MASK) {
-            *inep = ep[k].bEndpointAddress;
-            *inep_maxpacket = ep[k].wMaxPacketSize;
-            found_inep = 1;
-          }
-          if ((ep[k].bEndpointAddress & USB_ENDPOINT_DIR_MASK) == 0) {
-            *outep = ep[k].bEndpointAddress;
-            *outep_maxpacket = ep[k].wMaxPacketSize;
-            found_outep = 1;
-          }
-        } else if (ep[k].bmAttributes == USB_ENDPOINT_TYPE_INTERRUPT) {
-          if ((ep[k].bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
-              USB_ENDPOINT_DIR_MASK) {
-            *intep = ep[k].bEndpointAddress;
-            found_intep = 1;
+        *interface = dev->config[i].interface[j].altsetting[k].bInterfaceNumber;
+        *altsetting = dev->config[i].interface[j].altsetting[k].bAlternateSetting;
+        ep = dev->config[i].interface[j].altsetting[k].endpoint;
+
+        // Loop over the three endpoints to locate two bulk and
+        // one interrupt endpoint and FAIL if we cannot, and continue.
+        for (l = 0; l < no_ep; l++) {
+          if (ep[l].bmAttributes == USB_ENDPOINT_TYPE_BULK) {
+            if ((ep[l].bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
+                USB_ENDPOINT_DIR_MASK) {
+              *inep = ep[l].bEndpointAddress;
+              *inep_maxpacket = ep[l].wMaxPacketSize;
+              found_inep = 1;
+            }
+            if ((ep[l].bEndpointAddress & USB_ENDPOINT_DIR_MASK) == 0) {
+              *outep = ep[l].bEndpointAddress;
+              *outep_maxpacket = ep[l].wMaxPacketSize;
+              found_outep = 1;
+            }
+          } else if (ep[l].bmAttributes == USB_ENDPOINT_TYPE_INTERRUPT) {
+            if ((ep[l].bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
+                USB_ENDPOINT_DIR_MASK) {
+              *intep = ep[l].bEndpointAddress;
+              found_intep = 1;
+            }
           }
         }
-      }
-      if (found_inep && found_outep && found_intep)
-        // We assigned the endpoints so return here.
-        return 0;
-      // Else loop to next interface/config
-    }
-  }
+        if (found_inep && found_outep && found_intep)
+          // We assigned the endpoints so return here.
+          return 0;
+        // Else loop to next interface/config
+      } /* Next altsetting */
+    } /* Next interface */
+  } /* Next config */
   return -1;
 }
 
 /**
  * This function assigns params and usbinfo given a raw device
  * as input.
  * @param device the device to be assigned.
  * @param usbinfo a pointer to the new usbinfo.
  * @return an error code.
  */
@@ skipping 47 matching lines @@
    * Some devices must have their "OS Descriptor" massaged in order
    * to work.
    */
   if (FLAG_ALWAYS_PROBE_DESCRIPTOR(ptp_usb)) {
     // Massage the device descriptor
     (void) probe_device_descriptor(libusb_device, NULL);
   }
 
   /* Assign interface and endpoints to usbinfo... */
   err = find_interface_and_endpoints(libusb_device,
+                                     &ptp_usb->config,
                                      &ptp_usb->interface,
+                                     &ptp_usb->altsetting,
                                      &ptp_usb->inep,
                                      &ptp_usb->inep_maxpacket,
                                      &ptp_usb->outep,
                                      &ptp_usb->outep_maxpacket,
                                      &ptp_usb->intep);
 
   if (err) {
     LIBMTP_ERROR("LIBMTP PANIC: Unable to find interface & endpoints of device\n");
     return LIBMTP_ERROR_CONNECTING;
   }
@@ skipping 113 matching lines @@
 {
   return (usb_control_msg(ptp_usb->handle,
                           USB_DP_DTH|USB_RECIP_ENDPOINT,
                           USB_REQ_GET_STATUS,
                           USB_FEATURE_HALT,
                           ep,
                           (char *) status,
                           2,
                           ptp_usb->timeout));
 }