diff options
| -rw-r--r-- | usr/src/uts/common/io/usb/clients/hid/hid.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/ucode.h | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/usb/clients/hid/hidvar.h | 20 |
3 files changed, 14 insertions, 13 deletions
diff --git a/usr/src/uts/common/io/usb/clients/hid/hid.c b/usr/src/uts/common/io/usb/clients/hid/hid.c index eccd48bf08..31a0aad206 100644 --- a/usr/src/uts/common/io/usb/clients/hid/hid.c +++ b/usr/src/uts/common/io/usb/clients/hid/hid.c @@ -355,7 +355,7 @@ hid_attach(dev_info_t *dip, ddi_attach_cmd_t cmd) usb_alt_if_data_t *altif_data; char minor_name[HID_MINOR_NAME_LEN]; usb_ep_data_t *ep_data; - usb_ugen_info_t usb_ugen_info; + usb_ugen_info_t usb_ugen_info; switch (cmd) { case DDI_ATTACH: diff --git a/usr/src/uts/common/sys/ucode.h b/usr/src/uts/common/sys/ucode.h index 50db604b48..c770f14419 100644 --- a/usr/src/uts/common/sys/ucode.h +++ b/usr/src/uts/common/sys/ucode.h @@ -23,6 +23,7 @@ * Use is subject to license terms. * * Copyright 2021 OmniOS Community Edition (OmniOSce) Association. + * Copyright 2022 Joyent, Inc. */ #ifndef _SYS_UCODE_H @@ -199,7 +200,7 @@ typedef union ucode_file { #define UCODE_DEFAULT_BODY_SIZE (UCODE_KB(2) - UCODE_HEADER_SIZE_INTEL) /* - * For a single microcode file, the minimum size is 1K, maximum size is 280K. + * For a single microcode file, the minimum size is 1K, maximum size is 384K. * Such limitations, while somewhat artificial, are not only to provide better * sanity checks, but also avoid wasting precious memory at startup time as the * microcode buffer for the first processor has to be statically allocated. @@ -208,7 +209,7 @@ typedef union ucode_file { * is 16M. */ #define UCODE_MIN_SIZE UCODE_KB(1) -#define UCODE_MAX_SIZE UCODE_KB(280) +#define UCODE_MAX_SIZE UCODE_KB(384) #define UCODE_MAX_COMBINED_SIZE UCODE_MB(16) #define UCODE_SIZE_CONVERT(size, default_size) \ 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 |