input: wacom - add LED support for Cintiq 21ux2
Subsystems (2)
PATCH 3/4 input: wacom - add LED support for Cintiq 21ux2
Cintiq 21ux2 has two sets of four LEDs on right and left side of the tablet, respectively.
Signed-off-by Ping Cheng <[email protected]>
--- Documentation/ABI/testing/sysfs-driver-wacom | 23 ++++-- drivers/input/tablet/wacom.h | 10 ++-- drivers/input/tablet/wacom_sys.c | 98 +++++++++++++++++++------- 3 files changed, 94 insertions(+), 37 deletions(-)
Documentation/ABI/testing/sysfs-driver-wacom +16 -7
@@ -13,11 +13,11 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/led Date: August 2011 Contact: [email protected] Description: - Attribute group for control of the status LEDs and the OLED - displays found on the Wacom Intuos 4 M, L, and XL tablets. This - attribute group is not available for other Wacom tablets. + Attribute group for control of the status LEDs and the OLEDs. + This attribute group is only available for Intuos 4 M, L, + and XL (with LEDs and OLEDs) and Cintiq 21UX2 (LEDs only). Therefore its presence implicitly signifies the presence of - said LEDs and OLED displays on the tablet device. + said LEDs and OLEDs on the tablet device. What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance Date: August 2011
@@ -36,12 +36,21 @@ Description: when the stylus touches the tablet surface, or any button is pressed on the stylus. -What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led_select +What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led0_select Date: August 2011 Contact: [email protected] Description: - Writing to this file sets which one of the four status LEDs is - active (0..3). The other three LEDs are always inactive. + Writing to this file sets which one of the four (for Intuos 4) + or of the right four (for Cintiq 21UX2) status LEDs is active (0..3). + The other three LEDs on the same side are always inactive. + +What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select +Date: September 2011 +Contact: [email protected] +Description: + Writing to this file sets which one of the left four (for Cintiq 21UX2) + status LEDs is active (0..3). The other three LEDs on the left are always + inactive. What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance Date: August 2011
drivers/input/tablet/wacom.h +5 -5
@@ -11,7 +11,7 @@* Copyright (c) 2000 Daniel Egger <[email protected]> * Copyright (c) 2001 Frederic Lepied <[email protected]> * Copyright (c) 2004 Panagiotis Issaris <[email protected]> -* Copyright (c) 2002-2009 Ping Cheng <[email protected]> +* Copyright (c) 2002-2011 Ping Cheng <[email protected]> * * ChangeLog: * v0.1 (vp) - Initial release
@@ -93,7 +93,7 @@/* * Version Information */ -#define DRIVER_VERSION "v1.52" +#define DRIVER_VERSION "v1.53"#define DRIVER_AUTHOR "Vojtech Pavlik <[email protected]>"#define DRIVER_DESC "USB Wacom tablet driver"#define DRIVER_LICENSE "GPL"
@@ -115,9 +115,9 @@ struct wacom {bool open;char phys[32 ];struct wacom_led { -u8 select;/* status led selector (0..3) */ -u8 llv;/* status led brightness no button (1..127) */ -u8 hlv;/* status led brightness button pressed (1..127) */ +u8 select[2 ];/* status led selector (0..3) */ +u8 llv;/* status led brightness no button (1..127) */ +u8 hlv;/* status led brightness button pressed (1..127) */ u8 img_lum;/* OLED matrix display brightness */ } led; };
drivers/input/tablet/wacom_sys.c +73 -25
162 lines not on this page · raw message
Signature · 1 line
1.7.6
Dmitry Torokhov
maintainerDocumentation/ABI/testing/sysfs-driver-wacom Description: · line 39
Quoted 3 lines · Ping Cheng
Documentation/ABI/testing/sysfs-driver-wacom +1
-1-What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led_select +What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led0_select
Hmm, normally ABI does not change. I guess since we have not released an official kernel with this interface it is ok...
Applied (and the other 3 as well).
Signature · 1 line
Dmitry