diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/rbsettings.cpp | 15 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 8 |
2 files changed, 13 insertions, 10 deletions
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() | |||
425 | QString target = devices->value(platforms.at(i)).toString(); | 425 | QString target = devices->value(platforms.at(i)).toString(); |
426 | devices->endGroup(); | 426 | devices->endGroup(); |
427 | devices->beginGroup(target); | 427 | devices->beginGroup(target); |
428 | if(!devices->value("usbid").toString().isEmpty()) | 428 | QStringList ids = devices->value("usbid").toStringList(); |
429 | map.insert(devices->value("usbid").toString().toInt(0, 16), target); | 429 | int j = ids.size(); |
430 | while(j--) | ||
431 | map.insert(ids.at(j).toInt(0, 16), target); | ||
432 | |||
430 | devices->endGroup(); | 433 | devices->endGroup(); |
431 | } | 434 | } |
432 | |||
433 | return map; | 435 | return map; |
434 | } | 436 | } |
435 | 437 | ||
@@ -449,11 +451,12 @@ QMap<int, QString> RbSettings::usbIdErrorMap() | |||
449 | QString target = devices->value(platforms.at(i)).toString(); | 451 | QString target = devices->value(platforms.at(i)).toString(); |
450 | devices->endGroup(); | 452 | devices->endGroup(); |
451 | devices->beginGroup(target); | 453 | devices->beginGroup(target); |
452 | if(!devices->value("usberror").toString().isEmpty()) | 454 | QStringList ids = devices->value("usberror").toStringList(); |
453 | map.insert(devices->value("usberror").toString().toInt(0, 16), target); | 455 | int j = ids.size(); |
456 | while(j--) | ||
457 | map.insert(ids.at(j).toInt(0, 16), target); | ||
454 | devices->endGroup(); | 458 | devices->endGroup(); |
455 | } | 459 | } |
456 | |||
457 | return map; | 460 | return map; |
458 | } | 461 | } |
459 | 462 | ||
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 | |||
276 | manualname= | 276 | manualname= |
277 | brand=Apple | 277 | brand=Apple |
278 | usbid=0x05ac120a | 278 | usbid=0x05ac120a |
279 | usbincompat=0x05ac1260 | ||
279 | voicename=ipodnano | 280 | voicename=ipodnano |
280 | targetid=14 | 281 | targetid=14 |
281 | 282 | ||
@@ -368,8 +369,7 @@ bootloadername=x5_fw.bin | |||
368 | resolution=160x128x16 | 369 | resolution=160x128x16 |
369 | manualname= | 370 | manualname= |
370 | brand=Cowon | 371 | brand=Cowon |
371 | usbid=0x0e210510 | 372 | usbid=0x0e210510, 0x0e210513 |
372 | usbid=0x0e210513 | ||
373 | voicename=iaudiox5 | 373 | voicename=iaudiox5 |
374 | targetid=12 | 374 | targetid=12 |
375 | 375 | ||
@@ -440,6 +440,7 @@ manualname= | |||
440 | brand=Sandisk | 440 | brand=Sandisk |
441 | usbid=0x07817421 | 441 | usbid=0x07817421 |
442 | usberror=0x07810720 | 442 | usberror=0x07810720 |
443 | usbincompat=0x07817422, 0x07817423 | ||
443 | voicename=sansae200 | 444 | voicename=sansae200 |
444 | targetid=23 | 445 | targetid=23 |
445 | 446 | ||
@@ -453,8 +454,7 @@ bootloadername=firmware.mi4 | |||
453 | resolution=132x80x16 | 454 | resolution=132x80x16 |
454 | manualname= | 455 | manualname= |
455 | brand=Sandisk | 456 | brand=Sandisk |
456 | usbid=0x07817450 | 457 | usbid=0x07817450, 0x07817451 |
457 | usbid=0x07817451 | ||
458 | voicename=sansac200 | 458 | voicename=sansac200 |
459 | targetid=30 | 459 | targetid=30 |
460 | 460 | ||