BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi/usbtmc: Minor debug output changes.

This commit is contained in:
Bert Vermeulen 2014-07-17 01:06:13 +02:00
parent 73145219c0
commit e82d34a9c2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scpi/scpi_usbtmc_libusb.c
View File

@ -213,9 +213,8 @@ static int scpi_usbtmc_libusb_open(void *priv)
intfdes->bInterfaceProtocol != USBTMC_USB488) intfdes->bInterfaceProtocol != USBTMC_USB488)
continue; continue;
uscpi->interface = intfdes->bInterfaceNumber; uscpi->interface = intfdes->bInterfaceNumber;
sr_dbg("Interface %d", uscpi->interface);
config = confdes->bConfigurationValue; config = confdes->bConfigurationValue;
sr_dbg("Configuration %d", config); sr_dbg("Interface %d configuration %d.", uscpi->interface, config);
for (epidx = 0; epidx < intfdes->bNumEndpoints; epidx++) { for (epidx = 0; epidx < intfdes->bNumEndpoints; epidx++) {
ep = &intfdes->endpoint[epidx]; ep = &intfdes->endpoint[epidx];
if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_BULK && if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_BULK &&
@ -226,12 +225,12 @@ static int scpi_usbtmc_libusb_open(void *priv)
if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_BULK && if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_BULK &&
ep->bEndpointAddress & (LIBUSB_ENDPOINT_DIR_MASK)) { ep->bEndpointAddress & (LIBUSB_ENDPOINT_DIR_MASK)) {
uscpi->bulk_in_ep = ep->bEndpointAddress; uscpi->bulk_in_ep = ep->bEndpointAddress;
sr_dbg("Bulk IN EP %d", uscpi->bulk_in_ep); sr_dbg("Bulk IN EP %d", uscpi->bulk_in_ep & 0x7f);
} }
if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_INTERRUPT && if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_INTERRUPT &&
ep->bEndpointAddress & (LIBUSB_ENDPOINT_DIR_MASK)) { ep->bEndpointAddress & (LIBUSB_ENDPOINT_DIR_MASK)) {
uscpi->interrupt_ep = ep->bEndpointAddress; uscpi->interrupt_ep = ep->bEndpointAddress;
sr_dbg("Interrupt EP %d", uscpi->interrupt_ep); sr_dbg("Interrupt EP %d", uscpi->interrupt_ep & 0x7f);
} }
} }
found = 1; found = 1;