Refactor USB ID map retrieval from device settings file and minimize duplicated code.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20716 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-04-16 20:49:43 +00:00
parent 2995c2d265
commit bfce7eea5c
3 changed files with 23 additions and 57 deletions

View file

@ -333,9 +333,9 @@ bool Autodetection::detectUsb()
// usbids holds the mapping in the form
// ((VID<<16)|(PID)), targetname
// the ini file needs to hold the IDs as hex values.
QMap<int, QString> usbids = settings->usbIdMap();
QMap<int, QString> usberror = settings->usbIdErrorMap();
QMap<int, QString> usbincompat = settings->usbIdIncompatMap();
QMap<int, QString> usbids = settings->usbIdMap(RbSettings::MapDevice);
QMap<int, QString> usberror = settings->usbIdMap(RbSettings::MapError);
QMap<int, QString> usbincompat = settings->usbIdMap(RbSettings::MapIncompatible);
// usb pid detection
QList<uint32_t> attached;