diff options
| author | Pete Batard <pbatard@gmail.com> | 2011-03-03 18:35:35 +0000 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2011-06-17 12:04:15 +0200 |
| commit | 212ca37cdf525cfc07386b36bb3841bad0f7f3e3 (patch) | |
| tree | 7e99c7d3c54d66b373c5fab240ac1188bd42d55e /libusb/os/windows_usb.h | |
| parent | 98b240d03d81b92d4d0455dd2f34ea52c4454f92 (diff) | |
| download | libusb-212ca37cdf525cfc07386b36bb3841bad0f7f3e3.tar.gz | |
Windows: add speed retrievalfedora-1.0.9-0.1
* use the (currently superspeed unaware) _EX calls and structs
Diffstat (limited to 'libusb/os/windows_usb.h')
| -rw-r--r-- | libusb/os/windows_usb.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libusb/os/windows_usb.h b/libusb/os/windows_usb.h index 6f930d5..608f369 100644 --- a/libusb/os/windows_usb.h +++ b/libusb/os/windows_usb.h @@ -317,10 +317,12 @@ typedef RETURN_TYPE CONFIGRET; #define USB_REQUEST_SYNC_FRAME LIBUSB_REQUEST_SYNCH_FRAME #define USB_GET_NODE_INFORMATION 258 -#define USB_GET_NODE_CONNECTION_INFORMATION 259 #define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260 #define USB_GET_NODE_CONNECTION_NAME 261 #define USB_GET_HUB_CAPABILITIES 271 +#if !defined(USB_GET_NODE_CONNECTION_INFORMATION_EX) +#define USB_GET_NODE_CONNECTION_INFORMATION_EX 274 +#endif #if !defined(USB_GET_HUB_CAPABILITIES_EX) #define USB_GET_HUB_CAPABILITIES_EX 276 #endif @@ -381,8 +383,8 @@ DLL_DECLARE(WINAPI, CONFIGRET, CM_Get_Device_IDA, (DEVINST, PCHAR, ULONG, ULONG) #define IOCTL_USB_GET_NODE_INFORMATION \ CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_INFORMATION, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION \ - CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX \ + CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION_EX, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_USB_GET_NODE_CONNECTION_ATTRIBUTES \ CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_ATTRIBUTES, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -512,17 +514,17 @@ typedef struct _USB_PIPE_INFO { ULONG ScheduleOffset; } USB_PIPE_INFO, *PUSB_PIPE_INFO; -typedef struct _USB_NODE_CONNECTION_INFORMATION { +typedef struct _USB_NODE_CONNECTION_INFORMATION_EX { ULONG ConnectionIndex; USB_DEVICE_DESCRIPTOR DeviceDescriptor; UCHAR CurrentConfigurationValue; - BOOLEAN LowSpeed; + UCHAR Speed; BOOLEAN DeviceIsHub; USHORT DeviceAddress; ULONG NumberOfOpenPipes; USB_CONNECTION_STATUS ConnectionStatus; // USB_PIPE_INFO PipeList[0]; -} USB_NODE_CONNECTION_INFORMATION, *PUSB_NODE_CONNECTION_INFORMATION; +} USB_NODE_CONNECTION_INFORMATION_EX, *PUSB_NODE_CONNECTION_INFORMATION_EX; typedef struct _USB_HUB_CAP_FLAGS { ULONG HubIsHighSpeedCapable:1; |