Device reports from Toby Collett at Sony

Signed-off-by: Linus Walleij <triad@df.lth.se>

1 files changed, 115 insertions, 38 deletions

diff --git a/src/music-players.h b/src/music-players.h
index 14c1108..33c7b1f 100644
--- a/src/music-players.h
+++ b/src/music-players.h
@@ -6,6 +6,7 @@
  * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
  * Copyright (C) 2006-2007 Marcus Meissner
  * Copyright (C) 2007 Ted Bullock
+ * Copyright (C) 2012 Sony Mobile Communications AB
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1466,10 +1467,11 @@
    * 0x6nnn = UMS + ADB
    * 0x7nnn = MTP + CDC
    * 0x8nnn = MTP + CDC + ADB
-   * 0xannn = MTP + UMS + ?
+   * 0xannn = MTP + UMS (MTP for eMMC and UMS for external SD card)
+   * 0xbnnn = MTP + UMS + ADB
    * 0xennn = UMS only
    *
-   * The SonyEricsson and SONY devices have (at least)two deployed MTP
+   * The SonyEricsson and SONY devices have (at least) two deployed MTP
    * stacks: Aricent and Android. These have different bug flags, and
    * sometimes the same device has firmware upgrades moving it from
    * the Aricent to Android MTP stack without changing the device
@@ -1479,6 +1481,7 @@
    * That is why DEVICE_FLAG_NONE is used for these devices.
    *
    * Devices reported by:
+   * Sony Mobile Communications (via Toby Collett)
    * Jonas Salling
    * Eamonn Webster <eweb@users.sourceforge.net>
    * Alejandro DC <Alejandro_DC@users.sourceforge.ne>
@@ -1494,87 +1497,161 @@
    * Eduard Bloch <blade@debian.org>
    * Ah Hong <hongster@users.sourceforge.net>
    */
-  { "SonyEricsson", 0x0fce, "LT15i (Xperia arc S)", 0x014f,
+  { "SonyEricsson", 0x0fce, "LT15i Xperia arc S MTP", 0x014f,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "MT11i Xperia Neo", 0x0156,
+  { "SonyEricsson", 0x0fce, "MT11i Xperia Neo MTP", 0x0156,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "MK16i Xperia", 0x015a,
+  { "SonyEricsson", 0x0fce, "MK16i Xperia MTP", 0x015a,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "ST18a Xperia Ray", 0x0161,
+  { "SonyEricsson", 0x0fce, "ST18a Xperia Ray MTP", 0x0161,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "SK17i Xperia Mini Pro", 0x0166,
+  { "SonyEricsson", 0x0fce, "SK17i Xperia Mini Pro MTP", 0x0166,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "ST15i Xperia Mini", 0x0167,
+  { "SonyEricsson", 0x0fce, "ST15i Xperia Mini MTP", 0x0167,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "ST17i Xperia Active", 0x0168,
+  { "SonyEricsson", 0x0fce, "ST17i Xperia Active MTP", 0x0168,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT26i Xperia S", 0x0169,
+  { "SONY", 0x0fce, "LT26i Xperia S MTP", 0x0169,
       DEVICE_FLAG_NO_ZERO_READS },
-  { "SONY", 0x0fce, "WT19i Live Walkman", 0x016d,
+  { "SONY", 0x0fce, "WT19i Live Walkman MTP", 0x016d,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "ST21i Xperia Tipo", 0x0170,
+  { "SONY", 0x0fce, "ST21i Xperia Tipo MTP", 0x0170,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "ST15i Xperia U", 0x0171,
+  { "SONY", 0x0fce, "ST15i Xperia U MTP", 0x0171,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT22i Xperia P", 0x0172,
+  { "SONY", 0x0fce, "LT22i Xperia P MTP", 0x0172,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT26w Xperia Acro S", 0x0176,
+  { "SONY", 0x0fce, "MT27i Xperia Sola MTP", 0x0173,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT26w Xperia Acro HD IS12S MTP", 0x0175,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT26w Xperia Acro HD SO-03D MTP", 0x0176,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT28at Xperia Ion MTP", 0x0177,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT29i Xperia GX MTP", 0x0178,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "ST27i/ST27a Xperia go MTP", 0x017e,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "SO-05D Xperia SX MTP", 0x0181,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT30p Xperia T MTP", 0x0182,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT25i Xperia V MTP", 0x0186,
       DEVICE_FLAG_NONE },
 
   /*
    * MTP+UMS personalities of MTP devices (see above)
    */
-  { "SonyEricsson", 0x0fce, "ST17i Xperia Active (MTP+UMS mode)", 0x4168,
+  { "SonyEricsson", 0x0fce, "ST17i Xperia Active MTP+CDROM", 0x4168,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT26i Xperia S (MTP+UMS mode)", 0x4169,
+  { "SONY", 0x0fce, "LT26i Xperia S MTP+CDROM", 0x4169,
       DEVICE_FLAG_NO_ZERO_READS },
-  { "SONY", 0x0fce, "ST21i Xperia Tipo (MTP+UMS mode)", 0x4170,
+  { "SONY", 0x0fce, "ST21i Xperia Tipo MTP+CDROM", 0x4170,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "ST25i Xperia U MTP+CDROM", 0x4171,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT22i Xperia P MTP+CDROM", 0x4172,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "ST25i Xperia U (MTP+UMS mode)", 0x4171,
+  { "SONY", 0x0fce, "MT27i Xperia Sola MTP+CDROM", 0x4173,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT22i Xperia P (MTP+UMS mode)", 0x4172,
+  { "SONY", 0x0fce, "LT26w Xperia Acro HD IS12S MTP+CDROM", 0x4175,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT26w Xperia Acro S (MTP+UMS mode)", 0x4176,
+  { "SONY", 0x0fce, "LT26w Xperia Acro HD SO-03D MTP+CDROM", 0x4176,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT28at Xperia Ion MTP+CDROM", 0x4177,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT29i Xperia GX MTP+CDROM", 0x4178,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "ST27i/ST27a Xperia go MTP+CDROM", 0x417e,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "SO-05D Xperia SX MTP+CDROM", 0x4181,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT30p Xperia T MTP+CDROM", 0x4182,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT25i Xperia V MTP+CDROM", 0x4186,
       DEVICE_FLAG_NONE },
 
   /*
    * MTP+ADB personalities of MTP devices (see above)
    */
-  { "SonyEricsson", 0x0fce, "LT15i Xperia Arc (MTP+ADB mode)", 0x514f,
+  { "SonyEricsson", 0x0fce, "LT15i Xperia Arc MTP+ADB", 0x514f,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "MT11i Xperia Neo (MTP+ADB mode)", 0x5156,
+  { "SonyEricsson", 0x0fce, "MT11i Xperia Neo MTP+ADB", 0x5156,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "ST17i Xperia Active (MTP+ADB mode)", 0x5168,
+  { "SonyEricsson", 0x0fce, "ST17i Xperia Active MTP+ADB", 0x5168,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT26i Xperia S (MTP+ADB mode)", 0x5169,
+  { "SONY", 0x0fce, "LT26i Xperia S MTP+ADB", 0x5169,
       DEVICE_FLAG_NO_ZERO_READS },
-  { "SonyEricsson", 0x0fce, "MK16i Xperia (MTP+ADB mode)", 0x515a,
+  { "SonyEricsson", 0x0fce, "MK16i Xperia MTP+ADB", 0x515a,
+      DEVICE_FLAG_NONE },
+  { "SonyEricsson", 0x0fce, "ST18i Xperia Ray MTP+ADB", 0x5161,
+      DEVICE_FLAG_NONE },
+  { "SonyEricsson", 0x0fce, "SK17i Xperia Mini Pro MTP+ADB", 0x5166,
+      DEVICE_FLAG_NONE },
+  { "SonyEricsson", 0x0fce, "ST15i Xperia Mini MTP+ADB", 0x5167,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "ST18i Xperia Ray (MTP+ADB mode)", 0x5161,
+  { "SonyEricsson", 0x0fce, "LT26i Xperia S MTP+ADB", 0x5169,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "SK17i Xperia Mini Pro (MTP+ADB mode)", 0x5166,
+  { "SonyEricsson", 0x0fce, "SK17i Xperia Mini Pro MTP+ADB", 0x516d,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "ST15i Xperia Mini (MTP+ADB mode)", 0x5167,
+  { "SONY", 0x0fce, "ST21i Xperia Tipo MTP+ADB", 0x5170,
       DEVICE_FLAG_NONE },
-  { "SonyEricsson", 0x0fce, "SK17i Xperia Mini Pro (MTP+ADB mode)", 0x516d,
+  { "SONY", 0x0fce, "ST25i Xperia U MTP+ADB", 0x5171,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "ST21i Xperia Tipo (MTP+ADB mode)", 0x5170,
+  { "SONY", 0x0fce, "LT22i Xperia P MTP+ADB", 0x5172,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "ST25i Xperia U (MTP+ADB mode)", 0x5171,
+  { "SONY", 0x0fce, "MT27i Xperia Sola MTP+ADB", 0x5173,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT22i Xperia P (MTP+ADB mode)", 0x5172,
+  { "SONY", 0x0fce, "IS12S Xperia Acro HD MTP+ADB", 0x5175,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "LT26w Xperia Acro S (MTP+ADB mode)", 0x5176,
+  { "SONY", 0x0fce, "SO-03D Xperia Acro HD MTP+ADB", 0x5176,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT28at Xperia Ion MTP+ADB", 0x5177,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT29i Xperia GX MTP+ADB", 0x5178,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "ST27i/ST27a Xperia go MTP+ADB", 0x517e,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "SO-05D Xperia SX MTP+ADB", 0x5181,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT30p Xperia T MTP+ADB", 0x5182,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT25i Xperia V MTP+ADB", 0x5186,
+      DEVICE_FLAG_NONE },
+
+  /*
+   * MTP+UMS modes
+   * This mode is for using MTP on the internal storage (eMMC)
+   * and using UMS (Mass Storage Device Class) on the external
+   * SD card
+   */
+  { "SONY", 0x0fce, "MT27i Xperia Sola MTP+UMS", 0xa173,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "IS12S Xperia Acro HD MTP+UMS", 0xa175,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "SO-03D Xperia Acro HD MTP+UMS", 0xa176,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT28at Xperia Ion MTP+UMS", 0xa177,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "ST27i/ST27a Xperia go MTP+UMS", 0xa17e,
       DEVICE_FLAG_NONE },
 
   /*
-   * MTP+UMS+? modes
-   * No reports on other personalities on these devices.
+   * MTP+UMS+ADB modes
+   * Like the above, but also ADB
    */
-  { "SONY", 0x0fce, "MT27i Xperia Sola (MTP+UMS+? mode)", 0xa173,
+  { "SONY", 0x0fce, "MT27i Xperia Sola MTP+UMS+ADB", 0xb173,
       DEVICE_FLAG_NONE },
-  { "SONY", 0x0fce, "ST27i Xperia Go (MTP+UMS+? mode)", 0xa17e,
+  { "SONY", 0x0fce, "IS12S Xperia Acro MTP+UMS+ADB", 0xb175,
       DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "SO-03D Xperia Acro MTP+UMS+ADB", 0xb176,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "LT28at Xperia Ion MTP+UMS+ADB", 0xb177,
+      DEVICE_FLAG_NONE },
+  { "SONY", 0x0fce, "ST27i/ST27a Xperia go MTP+UMS+ADB", 0xb17e,
+      DEVICE_FLAG_NONE },
+
 
   /*
    * Motorola