| Message ID | 20220928204929.56157-1-ping.cheng@wacom.com |
|---|---|
| State | Accepted |
| Commit | bfdc750c4cb2f3461b9b00a2755e2145ac195c9a |
| Headers | show |
| Series | HID: wacom: add three styli to wacom_intuos_get_tool_type | expand |
On Wed, 28 Sep 2022, Ping Cheng wrote: > 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 <ping.cheng@wacom.com> > --- > drivers/hid/wacom_wac.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index 4fc64bd..a04f66a 100644 > --- a/drivers/hid/wacom_wac.c > +++ b/drivers/hid/wacom_wac.c > @@ -723,11 +723,14 @@ static int wacom_intuos_get_tool_type(int tool_id) > case 0x802: /* Intuos4/5 13HD/24HD General Pen */ > case 0x8e2: /* IntuosHT2 pen */ > case 0x022: > + case 0x200: /* Pro Pen 3 */ > + case 0x04200: /* Pro Pen 3 */ > case 0x10842: /* MobileStudio Pro Pro Pen slim */ > case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ > case 0x16802: /* Cintiq 13HD Pro Pen */ > case 0x18802: /* DTH2242 Pen */ > case 0x10802: /* Intuos4/5 13HD/24HD General Pen */ > + case 0x80842: /* Intuos Pro and Cintiq Pro 3D Pen */ > tool_type = BTN_TOOL_PEN; Applied, thanks Ping.
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 4fc64bd..a04f66a 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -723,11 +723,14 @@ static int wacom_intuos_get_tool_type(int tool_id) case 0x802: /* Intuos4/5 13HD/24HD General Pen */ case 0x8e2: /* IntuosHT2 pen */ case 0x022: + case 0x200: /* Pro Pen 3 */ + case 0x04200: /* Pro Pen 3 */ case 0x10842: /* MobileStudio Pro Pro Pen slim */ case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ case 0x16802: /* Cintiq 13HD Pro Pen */ case 0x18802: /* DTH2242 Pen */ case 0x10802: /* Intuos4/5 13HD/24HD General Pen */ + case 0x80842: /* Intuos Pro and Cintiq Pro 3D Pen */ tool_type = BTN_TOOL_PEN; break;
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 <ping.cheng@wacom.com> --- drivers/hid/wacom_wac.c | 3 +++ 1 file changed, 3 insertions(+)