windows_winusb: Add support for reporting super speed plus devices

Closes #531

Signed-off-by: Nathan Hjelm <hjelmn@google.com>

diff --git a/libusb/os/windows_winusb.c b/libusb/os/windows_winusb.c
index e3d5cfafbeed32e53d4ecba404f3f51107b95b6b..63d4f0020a7493235273e739cd59c49c6f475266 100644 (file)
--- a/libusb/os/windows_winusb.c
+++ b/libusb/os/windows_winusb.c
@@ -909,6 +909,8 @@ static int init_device(struct libusb_device *dev, struct libusb_device *parent_d
                                &conn_info_v2, sizeof(conn_info_v2), &conn_info_v2, sizeof(conn_info_v2), &size, NULL)) {
                                usbi_warn(ctx, "could not get node connection information (V2) for device '%s': %s",
                                          priv->dev_id,  windows_error_str(0));
+                       } else if (conn_info_v2.Flags.DeviceIsOperatingAtSuperSpeedPlusOrHigher) {
+                               conn_info.Speed = 4;
                        } else if (conn_info_v2.Flags.DeviceIsOperatingAtSuperSpeedOrHigher) {
                                conn_info.Speed = 3;
                        }
@@ -926,6 +928,7 @@ static int init_device(struct libusb_device *dev, struct libusb_device *parent_d
                case 1: dev->speed = LIBUSB_SPEED_FULL; break;
                case 2: dev->speed = LIBUSB_SPEED_HIGH; break;
                case 3: dev->speed = LIBUSB_SPEED_SUPER; break;
+               case 4: dev->speed = LIBUSB_SPEED_SUPER_PLUS; break;
                default:
                        usbi_warn(ctx, "unknown device speed %u", conn_info.Speed);
                        break;

diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h
index 3a911d55f1731a2f6832cfc83cc8badb4529aaa6..dd8fde5a4babfe05490c4396dec9dc20834f9d9b 100644 (file)
--- a/libusb/os/windows_winusb.h
+++ b/libusb/os/windows_winusb.h
@@ -397,7 +397,9 @@ typedef union _USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS {
        struct {
                ULONG DeviceIsOperatingAtSuperSpeedOrHigher:1;
                ULONG DeviceIsSuperSpeedCapableOrHigher:1;
-               ULONG ReservedMBZ:30;
+               ULONG DeviceIsOperatingAtSuperSpeedPlusOrHigher:1;
+               ULONG DeviceIsSuperSpeedPlusCapableOrHigher:1;
+               ULONG ReservedMBZ:28;
        };
 } USB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS, *PUSB_NODE_CONNECTION_INFORMATION_EX_V2_FLAGS;
 

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 46449d436a8fb068cfe7b084b2bb1c787a182640..1d98258e12f8e91336f9a743064a82776eded252 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11387
+#define LIBUSB_NANO 11388