X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscpi%2Fscpi_usbtmc_libusb.c;h=36ff316bcef30fc94dd469d2da21c1b10336eea5;hb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;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..36ff316b 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -17,9 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi_usbtmc"
 
@@ -92,7 +94,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 +214,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 +226,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;
@@ -555,8 +555,7 @@ static int scpi_usbtmc_libusb_close(void *priv)
 
 		uscpi->detached_kernel_driver = 0;
 	}
-	libusb_close(usb->devhdl);
-	usb->devhdl = NULL;
+	sr_usb_close(usb);
 
 	return SR_OK;
 }