convert-modeswitch.pl: fix message indices

[project/usbmode.git] / main.c

diff --git a/main.c b/main.c
index 5cf6a45..6cfe3b2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -25,7 +25,7 @@ int n_messages = 0;
 
 static struct avl_tree devices;
 
-static struct libusb_context *usb;
+struct libusb_context *usb;
 static struct libusb_device **usbdevs;
 static int n_usbdevs;
 
@@ -215,6 +215,7 @@ parse_interface_config(libusb_device *dev, struct usbdev_data *data)
 
        alt = &iface->altsetting[0];
        data->interface = alt->bInterfaceNumber;
+       data->dev_class = alt->bInterfaceClass;
 
        for (i = 0; i < alt->bNumEndpoints; i++) {
                const struct libusb_endpoint_descriptor *ep = &alt->endpoint[i];
@@ -261,6 +262,8 @@ static void iterate_devs(cmd_cb_t cb)
                if (libusb_open(usbdevs[i], &data.devh))
                        continue;
 
+               data.dev = usbdevs[i];
+
                libusb_get_string_descriptor_ascii(
                        data.devh, data.desc.iManufacturer,
                        (void *) data.mfg, sizeof(data.mfg));
@@ -280,7 +283,8 @@ static void iterate_devs(cmd_cb_t cb)
                if (data.config)
                        libusb_free_config_descriptor(data.config);
 
-               libusb_close(data.devh);
+               if (data.devh)
+                       libusb_close(data.devh);
        }
 }