From 4e37ed5c0e6c8402b9967451b89b380bc0397a39 Mon Sep 17 00:00:00 2001 From: Lt-Henry Date: Fri, 25 Mar 2022 23:30:27 +0100 Subject: [PATCH] usb_hid: digitizer usage constants from 1.3 specification MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I25a8020e70fc432fd315f0be1092a3fe94e78a8f Reviewed-on: https://review.haiku-os.org/c/haiku/+/5148 Reviewed-by: Jérôme Duval --- .../os/drivers/usb/USB_hid_page_digitizers.h | 77 +++++++++++++++++-- 1 file changed, 72 insertions(+), 5 deletions(-) diff --git a/headers/os/drivers/usb/USB_hid_page_digitizers.h b/headers/os/drivers/usb/USB_hid_page_digitizers.h index 1bfc9bad05..d2e954c914 100644 --- a/headers/os/drivers/usb/USB_hid_page_digitizers.h +++ b/headers/os/drivers/usb/USB_hid_page_digitizers.h @@ -8,8 +8,8 @@ /* Reference: * HID Usage Page 0x0D: DIGITIZERS - * HID Usage Tables Ver. 1.12 - * http://www.usb.org/developers/devclass_docs/Hut1_12.pdf + * HID Usage Tables Ver. 1.3 + * https://usb.org/sites/default/files/hut1_3_0.pdf */ // Usage IDs @@ -27,11 +27,11 @@ enum { B_HID_UID_DIG_ARMATURE, B_HID_UID_DIG_MULTIPLE_POINT_DIGITIZER, B_HID_UID_DIG_FREE_SPACE_WAND, - + B_HID_UID_DIG_STYLUS = 0x20, B_HID_UID_DIG_PUCK, B_HID_UID_DIG_FINGER, - + B_HID_UID_DIG_TIP_PRESSURE = 0x30, B_HID_UID_DIG_BARREL_PRESSURE, B_HID_UID_DIG_IN_RANGE, @@ -54,7 +54,74 @@ enum { B_HID_UID_DIG_SECONDARY_TIP_SWITCH, B_HID_UID_DIG_BARREL_SWITCH, B_HID_UID_DIG_ERASER, - B_HID_UID_DIG_TABLET_PICK + B_HID_UID_DIG_TABLET_PICK, + B_HID_UID_DIG_TOUCH_VALID, + B_HID_UID_DIG_WIDTH, + B_HID_UID_DIG_HEIGHT, + + B_HID_UID_DIG_CONTACT_IDENTIFIER = 0x51, + B_HID_UID_DIG_DEVICE_MODE, + B_HID_UID_DIG_DEVICE_IDENTIFIER, + B_HID_UID_DIG_CONTACT_COUNT, + B_HID_UID_DIG_CONTACT_COUNT_MAXIMUM, + B_HID_UID_DIG_SCAN_TIME, + B_HID_UID_DIG_SURFACE_SWITCH, + B_HID_UID_DIG_BUTTON_SWITCH, + B_HID_UID_DIG_PAD_TYPE, + B_HID_UID_DIG_SECONDARY_BARREL_SWITCH, + B_HID_UID_DIG_TRANSDUCER_SERIAL_NUMBER, + B_HID_UID_DIG_PREFERRED_COLOR, + B_HID_UID_DIG_PREFERRED_COLOR_IS_LOCKED, + B_HID_UID_DIG_PREFERRED_LINE_WIDTH, + B_HID_UID_DIG_PREFERRED_LINE_WIDTH_IS_LOCKED, + B_HID_UID_DIG_LATENCY_MODE, + B_HID_UID_DIG_GESTURE_CHARACTER_QUALITY, + B_HID_UID_DIG_GESTURE_CHARACTER_ENCODING, + B_HID_UID_DIG_GESTURE_CHARACTER_DATA_LENGTH, + B_HID_UID_DIG_GESTURE_CHARACTER_DATA, + B_HID_UID_DIG_UTF8_CHARACTER_GESTURE_ENCODING, + B_HID_UID_DIG_UTF16_LITTLE_ENDIAN_CHARACTER_GESTURE_ENCODING, + B_HID_UID_DIG_UTF16_BIG_ENDIAN_CHARACTER_GESTURE_ENCODING, + B_HID_UID_DIG_UTF32_LITTLE_ENDIAN_CHARACTER_GESTURE_ENCODING, + B_HID_UID_DIG_UTF32_BIG_ENDIAN_CHARACTER_GESTURE_ENCODING, + B_HID_UID_DIG_CAPACITIVE_HEAT_MAP_PROTOCOL_VENDOR_ID, + B_HID_UID_DIG_CAPACITIVE_HEAT_MAP_PROTOCOL_VERSION, + B_HID_UID_DIG_CAPACITIVE_HEAT_MAP_FRAME_DATA, + B_HID_UID_DIG_GESTURE_CHARACTER_ENABLE, + B_HID_UID_DIG_TRANSDUCER_SERIAL_NUMBER_PART_2, + B_HID_UID_DIG_NO_PREFERRED_COLOR, + B_HID_UID_DIG_PREFERRED_LINE_STYLE, + B_HID_UID_DIG_PREFERRED_LINE_STYLE_IS_LOCKED, + B_HID_UID_DIG_INK, + B_HID_UID_DIG_PENCIL, + B_HID_UID_DIG_HIGHLIGHTER, + B_HID_UID_DIG_CHISEL_MARKER, + B_HID_UID_DIG_BRUSH, + B_HID_UID_DIG_NO_PREFERENCE, + + B_HID_UID_DIG_DIGITIZER_DIAGNOSTIC = 0x80, + B_HID_UID_DIG_DIGITIZER_ERROR, + B_HID_UID_DIG_ERR_NORMAL_STATUS, + B_HID_UID_DIG_ERR_TRANSDUCERS_EXCEEDED, + B_HID_UID_DIG_ERR_FULL_TRANS_FEATURES_UNAVAILABLE, + B_HID_UID_DIG_ERR_CHARGE_LOW, + + B_HID_UID_DIG_TRANSDUCER_SOFTWARE_INFO = 0x90, + B_HID_UID_DIG_TRANSDUCER_VENDOR_ID, + B_HID_UID_DIG_TRANSDUCER_PRODUCT_ID, + B_HID_UID_DIG_DEVICE_SUPPORTED_PROTOCOLS, + B_HID_UID_DIG_TRANSDUCER_SUPPORTED_PROTOCOLS, + B_HID_UID_DIG_NO_PROTOCOL, + B_HID_UID_DIG_WACOM_AES_PROTOCOL, + B_HID_UID_DIG_USI_PROTOCOL, + B_HID_UID_DIG_MICROSOFT_PEN_PROTOCOL, + + B_HID_UID_DIG_SUPPORTED_REPORT_RATES = 0xA0, + B_HID_UID_DIG_REPORT_RATE, + B_HID_UID_DIG_TRANSDUCER_CONNECTED, + B_HID_UID_DIG_SWITCH_DISABLED, + B_HID_UID_DIG_SWITCH_UNIMPLEMENTED, + B_HID_UID_DIG_TRANSDUCER_SWITCHES };