Update libmtp from pre 1.1.4 git to 1.1.5 release.

src/libopenusb1-glue.c

 /*
  * \file libusb1-glue.c
  * Low-level USB interface glue towards libusb.
  *
  * Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
- * Copyright (C) 2005-2011 Linus Walleij <triad@df.lth.se>
+ * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2006-2011 Marcus Meissner
  * Copyright (C) 2007 Ted Bullock
  * Copyright (C) 2008 Chris Bagwell <chris@cnpbagwell.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 69 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 void init_usb();
 static void close_usb(PTP_USB* ptp_usb);
 static int find_interface_and_endpoints(openusb_dev_handle_t *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, openusb_dev_handle_t * 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_get_endpoint_status(PTP_USB* ptp_usb, int ep, uint16_t* status);
@@ skipping 1834 matching lines @@
          */
         openusb_reset(*ptp_usb->handle);
     }
     openusb_close_device(*ptp_usb->handle);
 }
 
 /**
  * Self-explanatory?
  */
 static int find_interface_and_endpoints(openusb_dev_handle_t *dev,
+        uint8_t *conf,
         uint8_t *interface,
+        uint8_t *altsetting,
         int* inep,
         int* inep_maxpacket,
         int* outep,
         int *outep_maxpacket,
         int* intep) {
-    int i, ret;
+    uint8_t i;
+    int ret;
     struct usb_device_desc desc;
 
     ret = openusb_parse_device_desc(libmtp_openusb_handle, *dev, NULL, 0, &desc);
     if (ret != OPENUSB_SUCCESS) return -1;
 
     // Loop over the device configurations
     for (i = 0; i < desc.bNumConfigurations; i++) {
         uint8_t j;
         struct usb_config_desc config;
 
         ret = openusb_parse_config_desc(libmtp_openusb_handle, *dev, NULL, 0, i, &config);
         if (ret != OPENUSB_SUCCESS) continue;
+        *conf = desc.bConfigurationValue;
         // Loop over each configurations interfaces
         for (j = 0; j < config.bNumInterfaces; j++) {
             uint8_t k;
             uint8_t no_ep;
             int found_inep = 0;
             int found_outep = 0;
             int found_intep = 0;
             struct usb_endpoint_desc ep;
             struct usb_interface_desc ifcdesc;
             openusb_parse_interface_desc(libmtp_openusb_handle, *dev, NULL, 0, i, j, 0, &ifcdesc);
             // MTP devices shall have 3 endpoints, ignore those interfaces
             // that haven't.
             no_ep = ifcdesc.bNumEndpoints;
             if (no_ep != 3)
                 continue;
             *interface = ifcdesc.bInterfaceNumber;
+            *altsetting = ifcdesc.bAlternateSetting;
             // 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++) {
                 openusb_parse_endpoint_desc(libmtp_openusb_handle, *dev, NULL, 0, i, j, 0, k, &ep);
                 if (ep.bmAttributes == USB_ENDPOINT_TYPE_BULK) {
                     if ((ep.bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
                             USB_ENDPOINT_DIR_MASK) {
                         *inep = ep.bEndpointAddress;
                         *inep_maxpacket = ep.wMaxPacketSize;
                         found_inep = 1;
@@ skipping 84 matching lines @@
      * to work.
      */
     if (FLAG_ALWAYS_PROBE_DESCRIPTOR(ptp_usb)) {
         // Massage the device descriptor
         (void) probe_device_descriptor(ldevice, NULL);
     }
 
 
     /* Assign interface and endpoints to usbinfo... */
     err = find_interface_and_endpoints(ldevice,
+            &ptp_usb->conf,
             &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) {
         openusb_free_devid_list(devs);
         LIBMTP_ERROR("LIBMTP PANIC: Unable to find interface & endpoints of device\n");
         return LIBMTP_ERROR_CONNECTING;
@@ skipping 110 matching lines @@
     ctrl.timeout = ptp_usb->timeout;
     ctrl.next = NULL;
     ctrl.setup.bRequest = USB_REQ_GET_STATUS;
     ctrl.setup.bmRequestType = USB_ENDPOINT_IN | USB_RECIP_ENDPOINT;
     ctrl.setup.wIndex = ep;
     ctrl.setup.wValue = USB_FEATURE_HALT;
     openusb_ctrl_xfer(*ptp_usb->handle, ptp_usb->interface, ep, &ctrl);
     return ctrl.result.status;
 
 }