Skip to content

Commit d9edf26

Browse files
PinglinuxJoshua-Dickens
authored andcommitted
backport: HID: wacom: add three styli to wacom_intuos_get_tool_type
We forgot to add the 3D pen ID a year ago. There are two new pro pen IDs to be added. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Jiri Kosina <[email protected]> [<[email protected]>: Imported into input-wacom repository (bfdc750c4cb2)] Signed-off-by: Joshua Dickens <[email protected]> [<[email protected]>: Imported into input-wacom repository (d70ecfb)] Signed-off-by: Joshua Dickens <[email protected]>
1 parent bac03b4 commit d9edf26

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

3.17/wacom_wac.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,11 +728,14 @@ static int wacom_intuos_get_tool_type(int tool_id)
728728
case 0x802: /* Intuos4/5 13HD/24HD General Pen */
729729
case 0x8e2: /* IntuosHT2 pen */
730730
case 0x022:
731+
case 0x200: /* Pro Pen 3 */
732+
case 0x04200: /* Pro Pen 3 */
731733
case 0x10842: /* MobileStudio Pro Pro Pen slim */
732734
case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */
733735
case 0x16802: /* Cintiq 13HD Pro Pen */
734736
case 0x18802: /* DTH2242 Pen */
735737
case 0x10802: /* Intuos4/5 13HD/24HD General Pen */
738+
case 0x80842: /* Intuos Pro and Cintiq Pro 3D Pen */
736739
tool_type = BTN_TOOL_PEN;
737740
break;
738741

3.7/wacom_wac.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,11 +681,14 @@ static int wacom_intuos_get_tool_type(int tool_id)
681681
case 0x802: /* Intuos4/5 13HD/24HD General Pen */
682682
case 0x8e2: /* IntuosHT2 pen */
683683
case 0x022:
684+
case 0x200: /* Pro Pen 3 */
685+
case 0x04200: /* Pro Pen 3 */
684686
case 0x10842: /* MobileStudio Pro Pro Pen slim */
685687
case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */
686688
case 0x16802: /* Cintiq 13HD Pro Pen */
687689
case 0x18802: /* DTH2242 Pen */
688690
case 0x10802: /* Intuos4/5 13HD/24HD General Pen */
691+
case 0x80842: /* Intuos Pro and Cintiq Pro 3D Pen */
689692
tool_type = BTN_TOOL_PEN;
690693
break;
691694

0 commit comments

Comments
 (0)