commit 42d0b79a787814d42e4c6f9dfe14f13cc0f6a758
author Mike Lockwood <lockwood@android.com> Tue Jan 04 14:48:57 2011 -0500
committer Mike Lockwood <lockwood@android.com> Thu Jan 06 11:46:55 2011 -0500
tree 9cb2c20fb8bf7d6b53c093c8e3dceb5dc0374523
parent d1108d74e13a74dc72e49513e0393e924f3d112c

MTP: changes to use new usb_request support in libusbhost

Change-Id: Ic091eab166a66efcde0395dcebbbc513f2322fca
Signed-off-by: Mike Lockwood <lockwood@android.com>

media/mtp/MtpClient.cpp

diff --git a/media/mtp/MtpClient.cpp b/media/mtp/MtpClient.cpp
index ceb6a43..c830540 100644
--- a/media/mtp/MtpClient.cpp
+++ b/media/mtp/MtpClient.cpp
@@ -29,12 +29,8 @@
 #include <errno.h>
 
 #include <usbhost/usbhost.h>
-#include <linux/version.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 20)
-#include <linux/usb/ch9.h>
-#else
-#include <linux/usb_ch9.h>
-#endif
+
+struct usb_device;
 
 namespace android {
 
@@ -194,20 +190,13 @@
                 return mDone;
             }
 
-            struct usb_endpoint *ep_in = usb_endpoint_open(device, ep_in_desc);
-            struct usb_endpoint *ep_out = usb_endpoint_open(device, ep_out_desc);
-            struct usb_endpoint *ep_intr = usb_endpoint_open(device, ep_intr_desc);
-
             if (usb_device_claim_interface(device, interface->bInterfaceNumber)) {
                 LOGE("usb_device_claim_interface failed errno: %d\n", errno);
-                usb_endpoint_close(ep_in);
-                usb_endpoint_close(ep_out);
-                usb_endpoint_close(ep_intr);
                 return mDone;
             }
 
             MtpDevice* mtpDevice = new MtpDevice(device, interface->bInterfaceNumber,
-                        ep_in, ep_out, ep_intr);
+                        ep_in_desc, ep_out_desc, ep_intr_desc);
             mDeviceList.add(mtpDevice);
             mtpDevice->initialize();
             deviceAdded(mtpDevice);