X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_usbtmc_libusb.c;h=c143e599936654802f34f43793764ed27428b354;hb=4264f1c03b3cd0e7d2634e207c79b1973789af28;hp=c4470b5db6dee0d98b4983a8a79b2627bf9e5f08;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c index c4470b5d..c143e599 100644 --- a/src/scpi/scpi_usbtmc_libusb.c +++ b/src/scpi/scpi_usbtmc_libusb.c @@ -92,7 +92,6 @@ enum { #define EOM 0x01 #define TERM_CHAR_ENABLED 0x02 - static GSList *scpi_usbtmc_libusb_scan(struct drv_context *drvc) { struct libusb_device **devlist; @@ -213,9 +212,8 @@ static int scpi_usbtmc_libusb_open(void *priv) intfdes->bInterfaceProtocol != USBTMC_USB488) continue; uscpi->interface = intfdes->bInterfaceNumber; - sr_dbg("Interface %d", uscpi->interface); config = confdes->bConfigurationValue; - sr_dbg("Configuration %d", config); + sr_dbg("Interface %d configuration %d.", uscpi->interface, config); for (epidx = 0; epidx < intfdes->bNumEndpoints; epidx++) { ep = &intfdes->endpoint[epidx]; if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_BULK && @@ -226,12 +224,12 @@ static int scpi_usbtmc_libusb_open(void *priv) if (ep->bmAttributes == LIBUSB_TRANSFER_TYPE_BULK && ep->bEndpointAddress & (LIBUSB_ENDPOINT_DIR_MASK)) { 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 && ep->bEndpointAddress & (LIBUSB_ENDPOINT_DIR_MASK)) { uscpi->interrupt_ep = ep->bEndpointAddress; - sr_dbg("Interrupt EP %d", uscpi->interrupt_ep); + sr_dbg("Interrupt EP %d", uscpi->interrupt_ep & 0x7f); } } found = 1;