diff options
Diffstat (limited to 'rbutil/rbutilqt/base/detect.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/detect.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/base/detect.cpp b/rbutil/rbutilqt/base/detect.cpp index 70f2de6f41..d471c98273 100644 --- a/rbutil/rbutilqt/base/detect.cpp +++ b/rbutil/rbutilqt/base/detect.cpp | |||
@@ -198,9 +198,7 @@ QMap<uint32_t, QString> Detect::listUsbDevices(void) | |||
198 | b = usb_busses; | 198 | b = usb_busses; |
199 | 199 | ||
200 | while(b) { | 200 | while(b) { |
201 | qDebug() << "bus:" << b->dirname << b->devices; | ||
202 | if(b->devices) { | 201 | if(b->devices) { |
203 | qDebug() << "devices present."; | ||
204 | struct usb_device *u; | 202 | struct usb_device *u; |
205 | u = b->devices; | 203 | u = b->devices; |
206 | while(u) { | 204 | while(u) { |
@@ -214,12 +212,14 @@ QMap<uint32_t, QString> Detect::listUsbDevices(void) | |||
214 | dev = usb_open(u); | 212 | dev = usb_open(u); |
215 | if(dev) { | 213 | if(dev) { |
216 | if(u->descriptor.iManufacturer) { | 214 | if(u->descriptor.iManufacturer) { |
217 | res = usb_get_string_simple(dev, u->descriptor.iManufacturer, string, sizeof(string)); | 215 | res = usb_get_string_simple(dev, u->descriptor.iManufacturer, |
216 | string, sizeof(string)); | ||
218 | if(res > 0) | 217 | if(res > 0) |
219 | name += QString::fromAscii(string) + " "; | 218 | name += QString::fromAscii(string) + " "; |
220 | } | 219 | } |
221 | if(u->descriptor.iProduct) { | 220 | if(u->descriptor.iProduct) { |
222 | res = usb_get_string_simple(dev, u->descriptor.iProduct, string, sizeof(string)); | 221 | res = usb_get_string_simple(dev, u->descriptor.iProduct, |
222 | string, sizeof(string)); | ||
223 | if(res > 0) | 223 | if(res > 0) |
224 | name += QString::fromAscii(string); | 224 | name += QString::fromAscii(string); |
225 | } | 225 | } |
@@ -227,7 +227,10 @@ QMap<uint32_t, QString> Detect::listUsbDevices(void) | |||
227 | usb_close(dev); | 227 | usb_close(dev); |
228 | if(name.isEmpty()) name = QObject::tr("(no description available)"); | 228 | if(name.isEmpty()) name = QObject::tr("(no description available)"); |
229 | 229 | ||
230 | if(id) usbids.insert(id, name); | 230 | if(id) { |
231 | usbids.insert(id, name); | ||
232 | qDebug() << "[Detect] USB:" << QString("0x%1").arg(id, 8, 16) << name; | ||
233 | } | ||
231 | u = u->next; | 234 | u = u->next; |
232 | } | 235 | } |
233 | } | 236 | } |
@@ -300,7 +303,7 @@ QMap<uint32_t, QString> Detect::listUsbDevices(void) | |||
300 | uint32_t id; | 303 | uint32_t id; |
301 | id = vid << 16 | pid; | 304 | id = vid << 16 | pid; |
302 | usbids.insert(id, description); | 305 | usbids.insert(id, description); |
303 | qDebug("VID: %04x, PID: %04x", vid, pid); | 306 | qDebug("[Detect] USB VID: %04x, PID: %04x", vid, pid); |
304 | } | 307 | } |
305 | if(buffer) free(buffer); | 308 | if(buffer) free(buffer); |
306 | } | 309 | } |