Switch to Digitizer usage for styluses (#464)

Fixes #442
DIGImend · Oct 4, 2020 · ec5c16d · ec5c16d
1 parent 691dae8
commit ec5c16d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/hid-kye.c b/hid-kye.c
@@ -37,7 +37,7 @@ static __u8 easypen_i405x_rdesc_fixed[] = {
  0xB1, 0x02, /* Feature (Variable), */
  0xC0, /* End Collection, */
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x10, /* Report ID (16), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -95,7 +95,7 @@ static __u8 mousepen_i608x_rdesc_fixed[] = {
  0xB1, 0x02, /* Feature (Variable), */
  0xC0, /* End Collection, */
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x10, /* Report ID (16), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -194,7 +194,7 @@ static __u8 mousepen_i608x_v2_rdesc_fixed[] = {
  0xB1, 0x02, /* Feature (Variable), */
  0xC0, /* End Collection, */
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x10, /* Report ID (16), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -293,7 +293,7 @@ static __u8 easypen_m610x_rdesc_fixed[] = {
  0xB1, 0x02, /* Feature (Variable), */
  0xC0, /* End Collection, */
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x10, /* Report ID (16), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -372,7 +372,7 @@ static __u8 pensketch_m912_rdesc_fixed[] = {
  0xB1, 0x02, /* Feature (Variable), */
  0xC0, /* End Collection, */
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x10, /* Report ID (16), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -501,7 +501,7 @@ static __u8 easypen_m406xe_rdesc_fixed[] = {
  0xB1, 0x02, /* Feature (Variable), */
  0xC0, /* End Collection, */
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x10, /* Report ID (16), */
  0x09, 0x20, /* Usage (Stylus), */

diff --git a/hid-uclogic-rdesc.c b/hid-uclogic-rdesc.c
@@ -21,7 +21,7 @@
 /* Fixed WP4030U report descriptor */
 __u8 uclogic_rdesc_wp4030u_fixed_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x09, /* Report ID (9), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -66,7 +66,7 @@ const size_t uclogic_rdesc_wp4030u_fixed_size =
 /* Fixed WP5540U report descriptor */
 __u8 uclogic_rdesc_wp5540u_fixed_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x09, /* Report ID (9), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -143,7 +143,7 @@ const size_t uclogic_rdesc_wp5540u_fixed_size =
 /* Fixed WP8060U report descriptor */
 __u8 uclogic_rdesc_wp8060u_fixed_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x09, /* Report ID (9), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -220,7 +220,7 @@ const size_t uclogic_rdesc_wp8060u_fixed_size =
 /* Fixed WP1062 report descriptor */
 __u8 uclogic_rdesc_wp1062_fixed_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x09, /* Report ID (9), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -268,7 +268,7 @@ const size_t uclogic_rdesc_wp1062_fixed_size =
 /* Fixed PF1209 report descriptor */
 __u8 uclogic_rdesc_pf1209_fixed_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x09, /* Report ID (9), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -345,7 +345,7 @@ const size_t uclogic_rdesc_pf1209_fixed_size =
 /* Fixed PID 0522 tablet report descriptor, interface 0 (stylus) */
 __u8 uclogic_rdesc_twhl850_fixed0_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x09, /* Report ID (9), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -457,7 +457,7 @@ const size_t uclogic_rdesc_twhl850_fixed2_size =
 /* Fixed TWHA60 report descriptor, interface 0 (stylus) */
 __u8 uclogic_rdesc_twha60_fixed0_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x09, /* Report ID (9), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -534,7 +534,7 @@ const size_t uclogic_rdesc_twha60_fixed1_size =
 /* Fixed report descriptor template for (tweaked) v1 pen reports */
 const __u8 uclogic_rdesc_v1_pen_template_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x07, /* Report ID (7), */
  0x09, 0x20, /* Usage (Stylus), */
@@ -588,7 +588,7 @@ const size_t uclogic_rdesc_v1_pen_template_size =
 /* Fixed report descriptor template for (tweaked) v2 pen reports */
 const __u8 uclogic_rdesc_v2_pen_template_arr[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x08, /* Report ID (8), */
  0x09, 0x20, /* Usage (Stylus), */

diff --git a/hid-viewsonic.c b/hid-viewsonic.c
@@ -25,7 +25,7 @@
 /* Fixed report descriptor of PD1011 signature pad */
 static __u8 pd1011_rdesc_fixed[] = {
  0x05, 0x0D, /* Usage Page (Digitizer), */
- 0x09, 0x02, /* Usage (Pen),  */
+ 0x09, 0x01, /* Usage (Digitizer), */
  0xA1, 0x01, /* Collection (Application), */
  0x85, 0x02, /* Report ID (2), */
  0x09, 0x20, /* Usage (Stylus), */