diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-05-25 05:22:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-25 05:22:45 -0700 |
| commit | 752b14705eac60fcd40e475189f632b1087ecf35 (patch) | |
| tree | 8c7e6029f4b9c45e0baf3b3656deae0835c8fb12 | |
| parent | 2ce0a831d66238e21523f0020c1284bfc3f891ed (diff) | |
| parent | 4f92fffc71224ad8edcd2d1d3e8037e5e28b2896 (diff) | |
| download | frameworks_base-752b14705eac60fcd40e475189f632b1087ecf35.zip frameworks_base-752b14705eac60fcd40e475189f632b1087ecf35.tar.gz frameworks_base-752b14705eac60fcd40e475189f632b1087ecf35.tar.bz2 | |
Merge "MTP: adjust ptptest app for changes in libusbhost API."
| -rw-r--r-- | media/mtp/ptptest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/mtp/ptptest.cpp b/media/mtp/ptptest.cpp index 5da4d45..3b09070 100644 --- a/media/mtp/ptptest.cpp +++ b/media/mtp/ptptest.cpp @@ -70,7 +70,7 @@ static void start_session(struct usb_endpoint *ep_in, struct usb_endpoint *ep_ou } } -static void usb_device_added(const char *devname) +static void usb_device_added(const char *devname, void *client_data) { struct usb_descriptor_header* desc; struct usb_descriptor_iter iter; @@ -140,7 +140,7 @@ static void usb_device_added(const char *devname) usb_device_close(device); } -static void usb_device_removed(const char *devname) +static void usb_device_removed(const char *devname, void *client_data) { if (sCameraDevice && !strcmp(devname, usb_device_get_name(sCameraDevice))) { delete sClient; @@ -153,7 +153,7 @@ static void usb_device_removed(const char *devname) int main(int argc, char* argv[]) { - if (usb_host_init(usb_device_added, usb_device_removed)) { + if (usb_host_init(usb_device_added, usb_device_removed, NULL)) { fprintf(stderr, "usb_host_init failed\n"); return -1; } |