diff options
author | hselasky <hselasky@FreeBSD.org> | 2011-06-25 15:51:44 +0000 |
---|---|---|
committer | hselasky <hselasky@FreeBSD.org> | 2011-06-25 15:51:44 +0000 |
commit | 7bf33d894c26f24291366fab4fb5bdd5557ec031 (patch) | |
tree | 40a8a95fcf4319ecaca64cf1730657fb0db5d898 /sys/dev/usb/usbdi.h | |
parent | dfc3b62a474375bbd3fdc0c0ccde2401ebf2b9f3 (diff) | |
download | FreeBSD-src-7bf33d894c26f24291366fab4fb5bdd5557ec031.zip FreeBSD-src-7bf33d894c26f24291366fab4fb5bdd5557ec031.tar.gz |
- Export the USB device ID format to userspace tools.
MFC after: 14 days
Diffstat (limited to 'sys/dev/usb/usbdi.h')
-rw-r--r-- | sys/dev/usb/usbdi.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index a216879..d832c32 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -270,12 +270,15 @@ struct usb_device_id { uint8_t match_flag_product:1; uint8_t match_flag_dev_lo:1; uint8_t match_flag_dev_hi:1; + uint8_t match_flag_dev_class:1; uint8_t match_flag_dev_subclass:1; uint8_t match_flag_dev_protocol:1; uint8_t match_flag_int_class:1; + uint8_t match_flag_int_subclass:1; uint8_t match_flag_int_protocol:1; + uint8_t match_flag_unused:6; #if USB_HAVE_COMPAT_LINUX /* which fields to match against */ @@ -291,7 +294,10 @@ struct usb_device_id { #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200 #endif -}; +} __aligned(32); + +/* check that the size of the structure above is correct */ +extern char usb_device_id_assert[(sizeof(struct usb_device_id) == 32) ? 1 : -1]; #define USB_VENDOR(vend) \ .match_flag_vendor = 1, .idVendor = (vend) |