diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2022-04-05 03:40:36 -0700 |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2022-06-26 17:09:14 +0200 |
| commit | c060e9ce30ac2e3ffb49d94209c4dae77b6642f7 (patch) | |
| tree | 3e98736a4007b839d586042ff33f9711070057f3 | |
| parent | 44e1c533e223fc4c35dd743b70523ac1722f0a69 (diff) | |
| download | libusb-c060e9ce30ac2e3ffb49d94209c4dae77b6642f7.tar.gz | |
windows: Use sdk-defined GUIDs where possible
Closes #1115
| -rw-r--r-- | libusb/os/windows_winusb.h | 12 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h index 6afd5cb..8c14cea 100644 --- a/libusb/os/windows_winusb.h +++ b/libusb/os/windows_winusb.h @@ -24,7 +24,8 @@ #define LIBUSB_WINDOWS_WINUSB_H #include <devioctl.h> -#include <guiddef.h> +#include <initguid.h> +#include <usbiodef.h> #include "windows_common.h" @@ -42,13 +43,8 @@ // Additional return code for HID operations that completed synchronously #define LIBUSB_COMPLETED (LIBUSB_SUCCESS + 1) -// http://msdn.microsoft.com/en-us/library/ff545978.aspx -// http://msdn.microsoft.com/en-us/library/ff545972.aspx -// http://msdn.microsoft.com/en-us/library/ff545982.aspx -static const GUID GUID_DEVINTERFACE_USB_HOST_CONTROLLER = {0x3ABF6F2D, 0x71C4, 0x462A, {0x8A, 0x92, 0x1E, 0x68, 0x61, 0xE6, 0xAF, 0x27}}; -static const GUID GUID_DEVINTERFACE_USB_HUB = {0xF18A0E88, 0xC30C, 0x11D0, {0x88, 0x15, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8}}; -static const GUID GUID_DEVINTERFACE_USB_DEVICE = {0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}; -static const GUID GUID_DEVINTERFACE_LIBUSB0_FILTER = {0xF9F3FF14, 0xAE21, 0x48A0, {0x8A, 0x25, 0x80, 0x11, 0xA7, 0xA9, 0x31, 0xD9}}; +// libusb0 Filter Device Interface GUID +DEFINE_GUID(GUID_DEVINTERFACE_LIBUSB0_FILTER, 0xF9F3FF14, 0xAE21, 0x48A0, 0x8A, 0x25, 0x80, 0x11, 0xA7, 0xA9, 0x31, 0xD9); // The following define MUST be == sizeof(USB_DESCRIPTOR_REQUEST) #define USB_DESCRIPTOR_REQUEST_SIZE 12U diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 520a82e..da45b37 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11739 +#define LIBUSB_NANO 11740 |