windows: Use sdk-defined GUIDs where possible

Closes #1115
This commit is contained in:
Shawn Hoffman 2022-04-05 03:40:36 -07:00 committed by Tormod Volden
parent 44e1c533e2
commit c060e9ce30
2 changed files with 5 additions and 9 deletions

View file

@ -24,7 +24,8 @@
#define LIBUSB_WINDOWS_WINUSB_H #define LIBUSB_WINDOWS_WINUSB_H
#include <devioctl.h> #include <devioctl.h>
#include <guiddef.h> #include <initguid.h>
#include <usbiodef.h>
#include "windows_common.h" #include "windows_common.h"
@ -42,13 +43,8 @@
// Additional return code for HID operations that completed synchronously // Additional return code for HID operations that completed synchronously
#define LIBUSB_COMPLETED (LIBUSB_SUCCESS + 1) #define LIBUSB_COMPLETED (LIBUSB_SUCCESS + 1)
// http://msdn.microsoft.com/en-us/library/ff545978.aspx // libusb0 Filter Device Interface GUID
// http://msdn.microsoft.com/en-us/library/ff545972.aspx DEFINE_GUID(GUID_DEVINTERFACE_LIBUSB0_FILTER, 0xF9F3FF14, 0xAE21, 0x48A0, 0x8A, 0x25, 0x80, 0x11, 0xA7, 0xA9, 0x31, 0xD9);
// 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}};
// The following define MUST be == sizeof(USB_DESCRIPTOR_REQUEST) // The following define MUST be == sizeof(USB_DESCRIPTOR_REQUEST)
#define USB_DESCRIPTOR_REQUEST_SIZE 12U #define USB_DESCRIPTOR_REQUEST_SIZE 12U

View file

@ -1 +1 @@
#define LIBUSB_NANO 11739 #define LIBUSB_NANO 11740