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

diff --git a/media/mtp/MtpDataPacket.h b/media/mtp/MtpDataPacket.h
index 3ae6226..577cea1 100644
--- a/media/mtp/MtpDataPacket.h
+++ b/media/mtp/MtpDataPacket.h
@@ -20,6 +20,9 @@
 #include "MtpPacket.h"
 #include "mtp.h"
 
+struct usb_device;
+struct usb_request;
+
 namespace android {
 
 class MtpStringBuffer;
@@ -100,15 +103,15 @@
 #endif
 
 #ifdef MTP_HOST
-    int                 read(struct usb_endpoint *ep);
-    int                 readData(struct usb_endpoint *ep, void* buffer, int length);
-    int                 readDataAsync(struct usb_endpoint *ep, void* buffer, int length);
-    int                 readDataWait(struct usb_endpoint *ep);
-    int                 readDataHeader(struct usb_endpoint *ep);
+    int                 read(struct usb_request *request);
+    int                 readData(struct usb_request *request, void* buffer, int length);
+    int                 readDataAsync(struct usb_request *req);
+    int                 readDataWait(struct usb_device *device);
+    int                 readDataHeader(struct usb_request *ep);
 
-    int                 writeDataHeader(struct usb_endpoint *ep, uint32_t length);
-    int                 write(struct usb_endpoint *ep);
-    int                 write(struct usb_endpoint *ep, void* buffer, uint32_t length);
+    int                 writeDataHeader(struct usb_request *ep, uint32_t length);
+    int                 write(struct usb_request *ep);
+    int                 write(struct usb_request *ep, void* buffer, uint32_t length);
 #endif
 
     inline bool         hasData() const { return mPacketSize > MTP_CONTAINER_HEADER_SIZE; }