xusb: Print configuration descriptor length

Also inform about reading OS string descriptor.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>

diff --git a/examples/xusb.c b/examples/xusb.c
index 61ce4dd542b3f88172bc16ac916264845340fb23..cf7c7a88b350c194a4c8ade700f120a1f8601e42 100644 (file)
--- a/examples/xusb.c
+++ b/examples/xusb.c
@@ -863,6 +863,7 @@ static int test_device(uint16_t vid, uint16_t pid)
 
        printf("\nReading first configuration descriptor:\n");
        CALL_CHECK_CLOSE(libusb_get_config_descriptor(dev, 0, &conf_desc), handle);
 
        printf("\nReading first configuration descriptor:\n");
        CALL_CHECK_CLOSE(libusb_get_config_descriptor(dev, 0, &conf_desc), handle);

+       printf("         descriptor length: %d\n", conf_desc->bLength);

        nb_ifaces = conf_desc->bNumInterfaces;
        printf("             nb interfaces: %d\n", nb_ifaces);
        if (nb_ifaces > 0)
        nb_ifaces = conf_desc->bNumInterfaces;
        printf("             nb interfaces: %d\n", nb_ifaces);
        if (nb_ifaces > 0)


@@ -932,12 +933,16 @@ static int test_device(uint16_t vid, uint16_t pid)
                        printf("   String (0x%02X): \"%s\"\n", string_index[i], string);
                }
        }
                        printf("   String (0x%02X): \"%s\"\n", string_index[i], string);
                }
        }

-       // Read the OS String Descriptor
+
+       printf("\nReading OS string descriptor:");

        r = libusb_get_string_descriptor(handle, MS_OS_DESC_STRING_INDEX, 0, (unsigned char*)string, MS_OS_DESC_STRING_LENGTH);
        if (r == MS_OS_DESC_STRING_LENGTH && memcmp(ms_os_desc_string, string, sizeof(ms_os_desc_string)) == 0) {
                // If this is a Microsoft OS String Descriptor,
                // attempt to read the WinUSB extended Feature Descriptors
        r = libusb_get_string_descriptor(handle, MS_OS_DESC_STRING_INDEX, 0, (unsigned char*)string, MS_OS_DESC_STRING_LENGTH);
        if (r == MS_OS_DESC_STRING_LENGTH && memcmp(ms_os_desc_string, string, sizeof(ms_os_desc_string)) == 0) {
                // If this is a Microsoft OS String Descriptor,
                // attempt to read the WinUSB extended Feature Descriptors

+               printf("\n");

                read_ms_winsub_feature_descriptors(handle, string[MS_OS_DESC_VENDOR_CODE_OFFSET], first_iface);
                read_ms_winsub_feature_descriptors(handle, string[MS_OS_DESC_VENDOR_CODE_OFFSET], first_iface);

+       } else {
+               printf(" no descriptor\n");

        }
 
        switch(test_mode) {
        }
 
        switch(test_mode) {

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index b82862deb699fc53e030023de0ce730ccdb65241..f526fcf299d22e830962269c7ac0d2c8a70f9c89 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11663
+#define LIBUSB_NANO 11665