diff options
Diffstat (limited to 'src/common/port/usb_port.cpp')
-rw-r--r-- | src/common/port/usb_port.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/common/port/usb_port.cpp b/src/common/port/usb_port.cpp index 76fa5b0..8ef4168 100644 --- a/src/common/port/usb_port.cpp +++ b/src/common/port/usb_port.cpp @@ -39,7 +39,7 @@ void Port::USB::initialize() usb_init(); VersionData vd = VersionData::fromString(LIBUSB_VERSION); TQString s = TQString("libusb %1").arg(vd.pretty()); - if ( vd<VersionData(0, 1, 8) ) qWarning("%s: may be too old (you need at least version 0.1.8)", s.latin1()); + if ( vd<VersionData(0, 1, 8) ) tqWarning("%s: may be too old (you need at least version 0.1.8)", s.latin1()); #endif } @@ -71,13 +71,13 @@ bool Port::USB::findBulk(const struct usb_device *dev) #ifdef HAVE_USB int configuration = -1, interface = -1, altsetting = -1, bulk_endpoint = -1; // walk through the possible configs, etc. - qDebug("This device has %d possible configuration(s).", dev->descriptor.bNumConfigurations); + tqDebug("This device has %d possible configuration(s).", dev->descriptor.bNumConfigurations); for (int c=0; c<dev->descriptor.bNumConfigurations; c++) { - qDebug("Looking at configuration %d...This configuration has %d interfaces.", c, dev->config[c].bNumInterfaces); + tqDebug("Looking at configuration %d...This configuration has %d interfaces.", c, dev->config[c].bNumInterfaces); for(int i=0; i<dev->config[c].bNumInterfaces; i++) { - qDebug(" Looking at interface %d...This interface has %d altsettings.", i, dev->config[c].interface[i].num_altsetting); + tqDebug(" Looking at interface %d...This interface has %d altsettings.", i, dev->config[c].interface[i].num_altsetting); for (int a=0; a < dev->config[c].interface[i].num_altsetting; a++) { - qDebug(" Looking at altsetting %d...This altsetting has %d endpoints.", a, dev->config[c].interface[i].altsetting[a].bNumEndpoints); + tqDebug(" Looking at altsetting %d...This altsetting has %d endpoints.", a, dev->config[c].interface[i].altsetting[a].bNumEndpoints); for (int e=0; e < dev->config[c].interface[i].altsetting[a].bNumEndpoints; e++) { TQString s; s.sprintf(" Endpoint %d: Address %02xh, attributes %02xh ", e, dev->config[c].interface[i].altsetting[a].endpoint[e].bEndpointAddress, dev->config[c].interface[i].altsetting[a].endpoint[e].bmAttributes); @@ -109,13 +109,13 @@ bool Port::USB::findBulk(const struct usb_device *dev) default: s += "ERROR! Got an illegal value in endpoint bEndpointAddress"; } } - qDebug("%s", s.latin1()); + tqDebug("%s", s.latin1()); } } } } if (bulk_endpoint<0) { - qDebug("No valid interface found!"); + tqDebug("No valid interface found!"); return false; } #endif @@ -151,7 +151,7 @@ struct usb_device *Port::USB::findDevice(uint vendorId, uint productId) } #else Q_UNUSED(vendorId); Q_UNUSED(productId); - qDebug("USB support disabled"); + tqDebug("USB support disabled"); #endif return 0; } @@ -350,10 +350,10 @@ bool Port::USB::write(uint ep, const char *data, uint size) int todo = size; for (;;) { int res = 0; - //qDebug("write ep=%i todo=%i/%i", ep, todo, size); + //tqDebug("write ep=%i todo=%i/%i", ep, todo, size); if ( mode==Interrupt ) res = usb_interrupt_write(_handle, ep, (char *)data + size - todo, todo, timeout(todo)); else res = usb_bulk_write(_handle, ep, (char *)data + size - todo, todo, timeout(todo)); - //qDebug("res: %i", res); + //tqDebug("res: %i", res); if ( res==todo ) break; if ( uint(time.elapsed())>3000 ) { // 3 s if ( res<0 ) setSystemError(i18n("Error sending data (ep=%1 res=%2)").arg(toHexLabel(ep, 2)).arg(res)); @@ -384,10 +384,10 @@ bool Port::USB::read(uint ep, char *data, uint size, bool *poll) int todo = size; for (;;) { int res = 0; - //qDebug("read ep=%i size=%i", ep, todo); + //tqDebug("read ep=%i size=%i", ep, todo); if ( mode==Interrupt ) res = usb_interrupt_read(_handle, ep, data + size - todo, todo, timeout(todo)); else res = usb_bulk_read(_handle, ep, data + size - todo, todo, timeout(todo)); - //qDebug("res: %i", res); + //tqDebug("res: %i", res); if ( res==todo ) break; if ( uint(time.elapsed())>3000 ) { // 3 s: seems to help icd2 in some case (?) if ( res<0 ) setSystemError(i18n("Error receiving data (ep=%1 res=%2)").arg(toHexLabel(ep, 2)).arg(res)); |