Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update MTP device definitions from upstream

Browse Source 
Fixes #1969337 [Calibre not detecting kindle fire](https://bugs.launchpad.net/calibre/+bug/1969337)
This commit is contained in:
Kovid Goyal 2022-04-18 11:49:49 +05:30
parent 61e6a7cd28
commit a46806c6a2
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 1056 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/calibre/devices/mtp/unix/upstream/device-flags.h
View File

@ -19,8 +19,8 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02111-1307, USA. * Boston, MA 02110-1301 USA
* *
* This file is supposed to be included by both libmtp and libgphoto2. * This file is supposed to be included by both libmtp and libgphoto2.
*/ */
@ -231,6 +231,12 @@
*/ */
#define DEVICE_FLAG_NIKON_BROKEN_CAPTURE 0x00100000 #define DEVICE_FLAG_NIKON_BROKEN_CAPTURE 0x00100000
/**
* To distinguish the V1 series from the DSLRs and handle them
* (libgphoto2)
*/
#define DEVICE_FLAG_NIKON_1 0x00200000
/** /**
* Broken capture support where cameras do not send CaptureComplete events. * Broken capture support where cameras do not send CaptureComplete events.
* (libgphoto2) * (libgphoto2)
@ -269,14 +275,10 @@
*/ */
#define DEVICE_FLAG_FORCE_RESET_ON_CLOSE 0x10000000 #define DEVICE_FLAG_FORCE_RESET_ON_CLOSE 0x10000000
/** /**
* Early Creative Zen (etc) models actually only support * On 2016 EOS cameras, do not close the session on exiting,
* command 9805 (Get object property list) and will hang * as the device will only report ptp errors afterwards.
* 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 #define DEVICE_FLAG_DONT_CLOSE_SESSION 0x20000000
/** /**
* It seems that some devices return an bad data when * It seems that some devices return an bad data when
* using the GetObjectInfo operation. So in these cases * using the GetObjectInfo operation. So in these cases
@ -288,6 +290,15 @@
* 32 bit. * 32 bit.
*/ */
#define DEVICE_FLAG_PROPLIST_OVERRIDES_OI 0x40000000 #define DEVICE_FLAG_PROPLIST_OVERRIDES_OI 0x40000000
/**
* The MTP stack of Samsung Galaxy devices has a mysterious bug in
* GetPartialObject. When GetPartialObject is invoked to read the last
* bytes of a file and the amount of data to read is such that the
* last USB packet sent in the reply matches exactly the USB 2.0
* packet size, then the Samsung Galaxy device hangs, resulting in a
* timeout error.
*/
#define DEVICE_FLAG_SAMSUNG_OFFSET_BUG 0x80000000
/** /**
* All these bug flags need to be set on SONY NWZ Walkman * All these bug flags need to be set on SONY NWZ Walkman

1099
src/calibre/devices/mtp/unix/upstream/music-players.h
View File

File diff suppressed because it is too large Load Diff