vid = pid = bus = addr = 0;
reg = g_regex_new(CONN_USB_VIDPID, 0, 0, NULL);
if (g_regex_match(reg, conn, 0, &match)) {
- /* Extract VID. */
- if ((mstr = g_match_info_fetch(match, 1))) {
+ if ((mstr = g_match_info_fetch(match, 1)))
vid = strtoul(mstr, NULL, 16);
- sr_spew("Extracted VID 0x%04x.", vid);
- }
g_free(mstr);
- /* Extract PID. */
- if ((mstr = g_match_info_fetch(match, 2))) {
+ if ((mstr = g_match_info_fetch(match, 2)))
pid = strtoul(mstr, NULL, 16);
- sr_spew("Extracted PID 0x%04x.", pid);
- }
g_free(mstr);
sr_dbg("Trying to find USB device with VID:PID = %04x:%04x.",
vid, pid);
g_regex_unref(reg);
reg = g_regex_new(CONN_USB_BUSADDR, 0, 0, NULL);
if (g_regex_match(reg, conn, 0, &match)) {
- /* Extract bus. */
- if ((mstr = g_match_info_fetch(match, 1))) {
+ if ((mstr = g_match_info_fetch(match, 1)))
bus = strtoul(mstr, NULL, 16);
- sr_spew("Extracted bus %d.", bus);
- }
g_free(mstr);
- /* Extract address. */
- if ((mstr = g_match_info_fetch(match, 2))) {
+ if ((mstr = g_match_info_fetch(match, 2)))
addr = strtoul(mstr, NULL, 16);
- sr_spew("Extracted address %d.", addr);
- }
g_free(mstr);
sr_dbg("Trying to find USB device with bus.address = "
"%d.%d.", bus, addr);
g_regex_unref(reg);
if (vid + pid + bus + addr == 0) {
- sr_err("Neither VID:PID nor bus.address was found.");
+ sr_err("Neither VID:PID nor bus.address was specified.");
return NULL;
}
struct libusb_device_descriptor des;
int ret, r, cnt, i, a, b;
- sr_dbg("Trying to open USB device.");
+ sr_dbg("Trying to open USB device %d.%d.", usb->bus, usb->address);
if ((cnt = libusb_get_device_list(usb_ctx, &devlist)) < 0) {
sr_err("Failed to retrieve device list: %s.",
b = libusb_get_bus_number(devlist[i]);
a = libusb_get_device_address(devlist[i]);
-
- if (b != usb->bus || a != usb->address) {
- sr_spew("bus.address = %d.%d does not match.", b, a);
+ if (b != usb->bus || a != usb->address)
continue;
- }
if ((r = libusb_open(devlist[i], &usb->devhdl)) < 0) {
sr_err("Failed to open device: %s.",