From 5f5dca72a9eef9923280bb05adb04a572e040f79 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Thu, 3 Apr 2008 23:14:58 +0000
Subject: Make USB ID handling recognize multiple values in the configuration.
 That way players using multiple PIDs can now get detected by any valid PID.
 Same applies to PIDs indicating a wrong player model.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16958 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/rbsettings.cpp | 15 +++++++++------
 rbutil/rbutilqt/rbutil.ini     |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'rbutil')

diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp
index 8782e53a26..fd74cbb2b5 100644
--- a/rbutil/rbutilqt/rbsettings.cpp
+++ b/rbutil/rbutilqt/rbsettings.cpp
@@ -425,11 +425,13 @@ QMap<int, QString> RbSettings::usbIdMap()
         QString target = devices->value(platforms.at(i)).toString();
         devices->endGroup();
         devices->beginGroup(target);
-        if(!devices->value("usbid").toString().isEmpty())
-            map.insert(devices->value("usbid").toString().toInt(0, 16), target);
+        QStringList ids = devices->value("usbid").toStringList();
+        int j = ids.size();
+        while(j--)
+            map.insert(ids.at(j).toInt(0, 16), target);
+
         devices->endGroup();
     }
-    
     return map;
 }
 
@@ -449,11 +451,12 @@ QMap<int, QString> RbSettings::usbIdErrorMap()
         QString target = devices->value(platforms.at(i)).toString();
         devices->endGroup();
         devices->beginGroup(target);
-         if(!devices->value("usberror").toString().isEmpty())
-            map.insert(devices->value("usberror").toString().toInt(0, 16), target);
+        QStringList ids = devices->value("usberror").toStringList();
+        int j = ids.size();
+        while(j--)
+            map.insert(ids.at(j).toInt(0, 16), target);
         devices->endGroup();
     }
-    
     return map;
 }
 
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index 8c04a322dd..0148eaf70b 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -276,6 +276,7 @@ resolution=176x132x16
 manualname=
 brand=Apple
 usbid=0x05ac120a
+usbincompat=0x05ac1260
 voicename=ipodnano
 targetid=14
 
@@ -368,8 +369,7 @@ bootloadername=x5_fw.bin
 resolution=160x128x16
 manualname=
 brand=Cowon
-usbid=0x0e210510
-usbid=0x0e210513
+usbid=0x0e210510, 0x0e210513
 voicename=iaudiox5
 targetid=12
 
@@ -440,6 +440,7 @@ manualname=
 brand=Sandisk
 usbid=0x07817421
 usberror=0x07810720
+usbincompat=0x07817422, 0x07817423
 voicename=sansae200
 targetid=23
 
@@ -453,8 +454,7 @@ bootloadername=firmware.mi4
 resolution=132x80x16
 manualname=
 brand=Sandisk
-usbid=0x07817450
-usbid=0x07817451
+usbid=0x07817450, 0x07817451
 voicename=sansac200
 targetid=30
 
-- 
cgit v1.2.3