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/MtpDevice.h

diff --git a/media/mtp/MtpDevice.h b/media/mtp/MtpDevice.h
index 67bb85f..d0a0fb3 100644
--- a/media/mtp/MtpDevice.h
+++ b/media/mtp/MtpDevice.h
@@ -25,6 +25,8 @@
 #include <utils/threads.h>
 
 struct usb_device;
+struct usb_request;
+struct usb_endpoint_descriptor;
 
 namespace android {
 
@@ -36,9 +38,10 @@
 private:
     struct usb_device*      mDevice;
     int                     mInterface;
-    struct usb_endpoint*    mEndpointIn;
-    struct usb_endpoint*    mEndpointOut;
-    struct usb_endpoint*    mEndpointIntr;
+    struct usb_request*     mRequestIn1;
+    struct usb_request*     mRequestIn2;
+    struct usb_request*     mRequestOut;
+    struct usb_request*     mRequestIntr;
     MtpDeviceInfo*          mDeviceInfo;
     MtpPropertyList         mDeviceProperties;
 
@@ -61,8 +64,9 @@
 
 public:
                             MtpDevice(struct usb_device* device, int interface,
-                                    struct usb_endpoint *ep_in, struct usb_endpoint *ep_out,
-                                    struct usb_endpoint *ep_intr);
+                                    const struct usb_endpoint_descriptor *ep_in,
+                                    const struct usb_endpoint_descriptor *ep_out,
+                                    const struct usb_endpoint_descriptor *ep_intr);
     virtual                 ~MtpDevice();
 
     inline int              getID() const { return mID; }