scpi_serial: Iterate serial_write as necessary to send full commands.

[libsigrok.git] / hardware / common / usb.c

diff --git a/hardware/common/usb.c b/hardware/common/usb.c
index efe4eb432a1444c854da118a3a15945707a0c40a..bac420b31c31c758594af37ddf1aca78393f26b4 100644 (file)
--- a/hardware/common/usb.c
+++ b/hardware/common/usb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
@@ -26,21 +26,21 @@
 #include "libsigrok-internal.h"
 
 /* SR_CONF_CONN takes one of these: */
-#define CONN_USB_VIDPID  "^([0-9a-z]{1,4})\\.([0-9a-z]{1,4})$"
+#define CONN_USB_VIDPID  "^([0-9a-z]{4})\\.([0-9a-z]{4})$"
 #define CONN_USB_BUSADDR "^(\\d+)\\.(\\d+)$"
 
 /* Some USBTMC-specific enums, as defined in the USBTMC standard. */
 #define SUBCLASS_USBTMC 0x03
 #define USBTMC_USB488   0x01
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "usb: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "usb: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /**
  * Find USB devices according to a connection string.
@@ -82,11 +82,11 @@ SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn)
                reg = g_regex_new(CONN_USB_BUSADDR, 0, 0, NULL);
                if (g_regex_match(reg, conn, 0, &match)) {
                        if ((mstr = g_match_info_fetch(match, 1)))
-                               bus = strtoul(mstr, NULL, 16);
+                               bus = strtoul(mstr, NULL, 10);
                        g_free(mstr);
 
                        if ((mstr = g_match_info_fetch(match, 2)))
-                               addr = strtoul(mstr, NULL, 16);
+                               addr = strtoul(mstr, NULL, 10);
                        g_free(mstr);
                        sr_dbg("Trying to find USB device with bus.address = "
                               "%d.%d.", bus, addr);