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

Unified Diff: src/device-flags.h

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
« no previous file with comments | « src/chdk_ptp.h ('k') | src/gphoto2-endian.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/device-flags.h
diff --git a/src/device-flags.h b/src/device-flags.h
index 06ef62aa1c2f6ff3111fd364809605e161f1b706..ba3f22bee5fcf5af3321a0d3e4a79f538150d40f 100644
--- a/src/device-flags.h
+++ b/src/device-flags.h
@@ -241,7 +241,7 @@
* Direct PTP match required.
* (libgphoto2)
*/
-#define DEVICE_FLAG_MATCH_PTP_INTERFACE 0x00800000
+#define DEVICE_FLAG_OLYMPUS_XML_WRAPPED 0x00800000
/**
* This flag is like DEVICE_FLAG_OGG_IS_UNKNOWN but for FLAC
* files instead. Using the unknown filetype for FLAC files.
@@ -272,6 +272,9 @@
* Early Creative Zen (etc) models actually only support
* command 9805 (Get object property list) and will hang
* if you try to get individual properties of an object.
+ * Or so it seemed. Later bug fixes to the library has made
+ * this work flawlessly so the bug flag is moot.
+ * NOT USED ANYMORE, THIS FLAG MAY BE RECYCLED.
*/
#define DEVICE_FLAG_BROKEN_GET_OBJECT_PROPVAL 0x20000000
/**
@@ -295,7 +298,7 @@
(DEVICE_FLAG_UNLOAD_DRIVER | \
DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | \
DEVICE_FLAG_UNIQUE_FILENAMES | \
- DEVICE_FLAG_FORCE_RESET_ON_CLOSE )
+ DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
/**
* All these bug flags need to be set on Android devices,
* they claim to support MTP operations they actually
@@ -308,7 +311,8 @@
DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | \
DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | \
DEVICE_FLAG_UNLOAD_DRIVER | \
- DEVICE_FLAG_LONG_TIMEOUT )
+ DEVICE_FLAG_LONG_TIMEOUT | \
+ DEVICE_FLAG_FORCE_RESET_ON_CLOSE)
/**
* All these bug flags appear on a number of SonyEricsson
* devices including Android devices not using the stock
@@ -326,4 +330,4 @@
#define DEVICE_FLAGS_ARICENT_BUGS \
(DEVICE_FLAG_IGNORE_HEADER_ERRORS | \
DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | \
- DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST )
+ DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST)
« no previous file with comments | « src/chdk_ptp.h ('k') | src/gphoto2-endian.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698