From 8ff2ec11c8cbfcef0d944ccc4392b72d8ce9adae Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 24 Feb 2011 21:09:05 +0000 Subject: [PATCH] updated music-players.h from libmtp added samsung S5620 git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13534 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/library.c | 3 ++ camlibs/ptp2/music-players.h | 59 +++++++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 8b0c37b26..48e77e0c0 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -1208,6 +1208,9 @@ static struct { /* https://sourceforge.net/tracker/index.php?func=detail&aid=1680029&group_id=8874&atid=108874 */ {"Nokia:N73", 0x0421, 0x0488, 0}, + + /* IRC reporter */ + {"Samsung:S5620", 0x04e8, 0x684a, 0}, }; #include "device-flags.h" diff --git a/camlibs/ptp2/music-players.h b/camlibs/ptp2/music-players.h index b225c4b82..a1547e923 100644 --- a/camlibs/ptp2/music-players.h +++ b/camlibs/ptp2/music-players.h @@ -3,7 +3,7 @@ * List of music players as USB ids. * * Copyright (C) 2005-2007 Richard A. Low - * Copyright (C) 2005-2010 Linus Walleij + * Copyright (C) 2005-2011 Linus Walleij * Copyright (C) 2006-2007 Marcus Meissner * Copyright (C) 2007 Ted Bullock * @@ -228,7 +228,7 @@ // From Santi Béjar - not sure this is MTP... // { "Samsung", 0x04e8, "E250 Mobile Phone", 0x663e, DEVICE_FLAG_UNLOAD_DRIVER }, // From an anonymous SF user - { "Samsung", 0x04e8, "M7600 Beat/GT-S8300T", 0x6642, + { "Samsung", 0x04e8, "M7600 Beat/GT-S8300T/SGH-F490", 0x6642, DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_BATTERY_LEVEL }, // From Lionel Bouton { "Samsung", 0x04e8, "X830 Mobile Phone", 0x6702, DEVICE_FLAG_UNLOAD_DRIVER }, @@ -244,6 +244,10 @@ // Added by Greg Fitzgerald { "Samsung", 0x04e8, "SAMSUNG Trance", 0x6763, DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_NO_ZERO_READS | DEVICE_FLAG_PLAYLIST_SPL_V1 }, + // From anonymous sourceforge user + // Guessing on .spl flag, maybe needs NO_ZERO_READS, whatdoIknow + { "Samsung", 0x04e8, "GT-S8500", 0x6819, + DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_PLAYLIST_SPL_V1 }, // From: Erik Berglund // Logs indicate this needs DEVICE_FLAG_NO_ZERO_READS // https://sourceforge.net/tracker/?func=detail&atid=809061&aid=3026337&group_id=158745 @@ -267,8 +271,10 @@ { "Microsoft", 0x045e, "Windows MTP Simulator", 0x0622, DEVICE_FLAG_NONE }, // Reported by Edward Hutchins (used for Zune HDs) { "Microsoft", 0x045e, "Zune HD", 0x063e, DEVICE_FLAG_NONE }, + // Reported by anonymous sourceforge user + { "Microsoft", 0x045e, "Kin 1", 0x0640, DEVICE_FLAG_NONE }, // Reported by Farooq Zaman (used for all Zunes) - { "Microsoft", 0x045e, "Zune", 0x0710, DEVICE_FLAG_NONE }, + { "Microsoft", 0x045e, "Zune", 0x0710, DEVICE_FLAG_NONE }, /* * JVC @@ -322,7 +328,7 @@ { "Philips", 0x0471, "GoGear SA1VBE08KX/78", 0x208e, DEVICE_FLAG_UNLOAD_DRIVER }, // From Anonymous SourceForge User - { "Philips", 0x0471, "GoGear VIBE SA2VBE16K/02", 0x20b7, + { "Philips", 0x0471, "GoGear VIBE SA2VBE[08|16]K/02", 0x20b7, DEVICE_FLAG_UNLOAD_DRIVER }, // from XNJB user { "Philips", 0x0471, "PSA235", 0x7e01, DEVICE_FLAG_NONE }, @@ -408,16 +414,27 @@ { "SanDisk", 0x0781, "Sansa Fuze", 0x74c0, DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR | + DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED }, // Harry Phillips { "SanDisk", 0x0781, "Sansa Fuze v2", 0x74c2, DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR | + DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED }, // Reported by anonymous SourceForge user + // Need BROKEN_SET_SAMPLE_DIMENSIONS accordning to + // Michael { "SanDisk", 0x0781, "Sansa Clip+", 0x74d0, DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR | + DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS | + DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED}, + // Reported by anonymous SourceForge user + { "SanDisk", 0x0781, "Sansa Fuze+", 0x74e0, + DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | + DEVICE_FLAG_NO_RELEASE_INTERFACE | DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR | + DEVICE_FLAG_BROKEN_SET_SAMPLE_DIMENSIONS | DEVICE_FLAG_CANNOT_HANDLE_DATEMODIFIED}, @@ -721,6 +738,8 @@ { "Nokia", 0x0421, "E63", 0x0179, DEVICE_FLAG_NONE }, // From an anonymous SourceForge user { "Nokia", 0x0421, "E71x", 0x01a1, DEVICE_FLAG_NONE }, + // From Ser + { "Nokia", 0x0421, "E52", 0x01cf, DEVICE_FLAG_NONE }, // From Marcus Meissner { "Nokia", 0x0421, "3710", 0x01ee, DEVICE_FLAG_NONE }, // From: AxeL @@ -737,6 +756,10 @@ { "Nokia", 0x0421, "N97 mini", 0x026b, DEVICE_FLAG_NONE }, // From: Alexander Kojevnikov { "Nokia", 0x0421, "6600i", 0x0297, DEVICE_FLAG_NONE }, + // From: Karthik Paithankar + { "Nokia", 0x0421, "2710", 0x02c1, DEVICE_FLAG_NONE }, + // From: Anonymous sourceforge user + { "Nokia", 0x0421, "5230", 0x02e2, DEVICE_FLAG_NONE }, // From: Lan Liu at Nokia { "Nokia", 0x0421, "N8", 0x02fe, DEVICE_FLAG_NONE }, // From: Lan Liu at Nokia @@ -839,8 +862,9 @@ { "TrekStor", 0x0402, "i.Beat Sweez FM", 0x0611, DEVICE_FLAG_UNLOAD_DRIVER }, // Reported by Fox-ino - { "ALi Corp.", 0x0402, "MPMAN 2GB", 0x5668, - DEVICE_FLAG_UNLOAD_DRIVER }, + // No confirmation that this is really MTP so commented it out. + // { "ALi Corp.", 0x0402, "MPMAN 2GB", 0x5668, + // DEVICE_FLAG_UNLOAD_DRIVER }, // Reported by Anonymous SourceForge user {"TrekStor", 0x1e68, "i.Beat Organix 2.0", 0x0002, DEVICE_FLAG_UNLOAD_DRIVER }, @@ -1038,6 +1062,14 @@ DEVICE_FLAG_UNLOAD_DRIVER | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_UNIQUE_FILENAMES }, + { "Sony", 0x054c, "Walkman NWZ-B153F", 0x04be, + DEVICE_FLAG_UNLOAD_DRIVER | + DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | + DEVICE_FLAG_UNIQUE_FILENAMES }, + { "Sony", 0x054c, "Walkman NWZ-E354", 0x04cb, + DEVICE_FLAG_UNLOAD_DRIVER | + DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | + DEVICE_FLAG_UNIQUE_FILENAMES }, // Reported by Anonymous SourceForge user { "Sony", 0x054c, "DCR-SR75", 0x1294, DEVICE_FLAG_UNLOAD_DRIVER | @@ -1083,7 +1115,8 @@ { "SonyEricsson", 0x0fce, "W995", 0x0112, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, // Reported by anonymous SourceForge user { "SonyEricsson", 0x0fce, "U5", 0x0133, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, - + // Reported by Flo + { "SonyEricsson", 0x0fce, "U8i", 0x013a, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, // Reported by Jonas Nyrén { "SonyEricsson", 0x0fce, "W302", 0x10c8, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, @@ -1105,6 +1138,12 @@ DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, + // Reported by anonymous user + { "Motorola", 0x22b8, "DROID2", 0x42a7, + DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | + DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST | + DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST_ALL | + DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, // Reported by Marcus Meissner to libptp2 { "Motorola", 0x22b8, "K1", 0x4811, DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST }, // Reported by Hans-Joachim Baader to libptp2 @@ -1172,6 +1211,8 @@ DEVICE_FLAG_BROKEN_BATTERY_LEVEL | DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST | DEVICE_FLAG_BROKEN_SET_OBJECT_PROPLIST | DEVICE_FLAG_BROKEN_SEND_OBJECT_PROPLIST }, + // Reported by anonymous user + { "Conceptronic", 0x1e53, "CMTD2", 0x0005, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, // Reported by Demadridsur { "O2 Sistemas", 0x1e53, "ZoltarTV", 0x0006, DEVICE_FLAG_BROKEN_MTPGETOBJPROPLIST }, // Reported by da-beat @@ -1197,6 +1238,10 @@ */ { "Coby", 0x1e74, "COBY MP705", 0x6512, DEVICE_FLAG_NONE }, + // Reported by anonymous SourceForge user + { "Curitel Communications, Inc.", 0x106c, + "Verizon Wireless Device", 0x3215, DEVICE_FLAG_NONE }, + /* * Other strange stuff. */