Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(934)

Unified Diff: patches/03_enable_ptp_support.patch

Issue 2345493002: Uprev libmtp to 1.1.12 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libmtp@master
Patch Set: Re-upload cl Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: patches/03_enable_ptp_support.patch
diff --git a/patches/03_enable_ptp_support.patch b/patches/03_enable_ptp_support.patch
index 849c80b2e73fec13db47403794126fb46e2313f2..925f1ab63014bdce2b7fb77e0a5a5fac527957b3 100644
--- a/patches/03_enable_ptp_support.patch
+++ b/patches/03_enable_ptp_support.patch
@@ -1,8 +1,8 @@
-Index: src/libusb1-glue.c
-===================================================================
---- src/libusb1-glue.c (revision 148597)
-+++ src/libusb1-glue.c (working copy)
-@@ -197,15 +197,15 @@
+diff --git a/src/libusb1-glue.c b/src/libusb1-glue.c
+index 45572f7..187c485 100644
+--- a/src/libusb1-glue.c
++++ b/src/libusb1-glue.c
+@@ -221,15 +221,15 @@ static void free_mtpdevice_list(mtpdevice_list_t *devlist)
}
/**
@@ -22,15 +22,15 @@ Index: src/libusb1-glue.c
*/
static int probe_device_descriptor(libusb_device *dev, FILE *dumpfile)
{
-@@ -289,7 +289,6 @@
- * Check for Still Image Capture class with PIMA 15740 protocol,
- * also known as PTP
+@@ -313,7 +313,6 @@ static int probe_device_descriptor(libusb_device *dev, FILE *dumpfile)
+ * TODO: Check for Still Image Capture class with PIMA 15740
+ * protocol, also known as PTP
*/
-#if 0
if (intf->bInterfaceClass == LIBUSB_CLASS_PTP
&& intf->bInterfaceSubClass == 0x01
&& intf->bInterfaceProtocol == 0x01) {
-@@ -297,17 +296,9 @@
+@@ -322,17 +321,9 @@ static int probe_device_descriptor(libusb_device *dev, FILE *dumpfile)
fprintf(dumpfile, " Found PTP device, check vendor "
"extension...\n");
}
« no previous file with comments | « patches/02_check_ptp_operation_support.patch ('k') | patches/04_parse_extension_descriptor_null_check.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698