diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-02-09 18:32:59 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-02-09 18:32:59 -0500 |
| commit | 069d372e51ed082937f2ae1e3fc6022af253b87d (patch) | |
| tree | 63cf8b1a00367f5a0d505c5e4e567e2f5a3754b3 /usr/src/uts/common/sys/usb | |
| parent | 3ab482828d080ea445f7748fbc3acc726f638c8e (diff) | |
| parent | 27c57c46550d6ff25e4454b21d73ca9e29f12d74 (diff) | |
| download | illumos-joyent-release-20220210.tar.gz | |
[illumos-gate merge]release-20220210
commit 27c57c46550d6ff25e4454b21d73ca9e29f12d74
14490 ucodeadm cannot handle latest Intel microcode (again)
commit cfe80fe3616624773746461f58f667b0c4141275
14464 want ugen nodes for devices attached by hid
Conflicts:
usr/src/uts/common/io/usb/clients/hid/hid.c
Diffstat (limited to 'usr/src/uts/common/sys/usb')
| -rw-r--r-- | usr/src/uts/common/sys/usb/clients/hid/hidvar.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/uts/common/sys/usb/clients/hid/hidvar.h b/usr/src/uts/common/sys/usb/clients/hid/hidvar.h index ee68f0088a..61ac49800a 100644 --- a/usr/src/uts/common/sys/usb/clients/hid/hidvar.h +++ b/usr/src/uts/common/sys/usb/clients/hid/hidvar.h @@ -84,10 +84,10 @@ extern "C" { * If the hid descriptor is not valid, the following values are * used. */ -#define USBKPSZ 8 /* keyboard packet size */ -#define USBMSSZ 3 /* mouse packet size */ -#define USB_KB_HID_DESCR_LENGTH 0x3f /* keyboard Report descr length */ -#define USB_MS_HID_DESCR_LENGTH 0x32 /* mouse Report descr length */ +#define USBKPSZ 8 /* keyboard packet size */ +#define USBMSSZ 3 /* mouse packet size */ +#define USB_KB_HID_DESCR_LENGTH 0x3f /* keyboard Report descr length */ +#define USB_MS_HID_DESCR_LENGTH 0x32 /* mouse Report descr length */ /* * Flags for the default pipe. @@ -119,12 +119,12 @@ extern "C" { /* Attach/detach states */ #define HID_LOCK_INIT 0x01 /* Initial attach state */ -#define HID_MINOR_NODES 0x02 /* Set after minor node is created */ +#define HID_MINOR_NODES 0x02 /* Set after minor node is created */ /* HID Protocol Requests */ -#define SET_IDLE 0x0a /* bRequest value to set idle request */ -#define DURATION (0<<8) /* no. of repeat reports (HID 7.2.4) */ -#define SET_PROTOCOL 0x0b /* bRequest value for boot protocol */ +#define SET_IDLE 0x0a /* bRequest value to set idle request */ +#define DURATION (0<<8) /* no. of repeat reports (HID 7.2.4) */ +#define SET_PROTOCOL 0x0b /* bRequest value for boot protocol */ /* Hid PM scheme */ typedef enum { @@ -249,7 +249,7 @@ _NOTE(SCHEME_PROTECTS_DATA("stable data", usb_ep_descr)) * handle is used when the kernel is in the single thread mode * so the field is tagged with this note. */ -_NOTE(SCHEME_PROTECTS_DATA("unique per call", +_NOTE(SCHEME_PROTECTS_DATA("unique per call", hid_state_t::hid_polled_console_info)) /* @@ -316,7 +316,7 @@ _NOTE(SCHEME_PROTECTS_DATA("unique per call", hid_default_pipe_arg_t)) * Debug message Masks */ #define PRINT_MASK_ATTA 0x00000001 -#define PRINT_MASK_OPEN 0x00000002 +#define PRINT_MASK_OPEN 0x00000002 #define PRINT_MASK_CLOSE 0x00000004 #define PRINT_MASK_EVENTS 0x00000008 #define PRINT_MASK_PM 0x00000010 |