Graphire3 support

PATCH Applied Panagiotis Issaris 3 participants 5 messages Jan 24, 2004 – Jan 27, 2004 USB

lore

Share & tools

lore

Panagiotis Issaris

author

2004-01-24 00:43 UTC #0 lore raw

PATCH 1/1 Graphire3 support

Hi,

I got a Wacom Graphire3 for my birthday and unfortunately it didn't work. After some playing around, I noticed the 2.6 kernel needs a few small modifications to make it work.

This simple patch adds support for the Wacom Graphire 3. It applies fine to both 2.6.2-rc1-mm2 and 2.6.2-rc1.

With friendly regards,
Takis

scratch/src/linux-2.6/drivers/usb/input/hid-core.c renamed from drivers/usb/input/hid-core.c +1 -0

diff -ur linux-2.6.1/drivers/usb/input/hid-core.c /scratch/src/linux-2.6/drivers/usb/input/hid-core.c
@@ -1369,6 +1369,7 @@
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 1, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 2, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 3, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 1, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 2, HID_QUIRK_IGNORE },

scratch/src/linux-2.6/drivers/usb/input/wacom.c renamed from drivers/usb/input/wacom.c +2 -0

diff -ur linux-2.6.1/drivers/usb/input/wacom.c /scratch/src/linux-2.6/drivers/usb/input/wacom.c
@@ -428,6 +428,7 @@
         { "Wacom Graphire",      8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
 	{ "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
  	{ "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 32, 1, wacom_graphire_irq },
+ 	{ "Wacom Graphire3", 8,  13918, 10206,  511, 32, 1, wacom_graphire_irq },
   	{ "Wacom Intuos 4x5",   10,  12700, 10360, 1023, 15, 2, wacom_intuos_irq },
  	{ "Wacom Intuos 6x8",   10,  20600, 16450, 1023, 15, 2, wacom_intuos_irq },
  	{ "Wacom Intuos 9x12",  10,  30670, 24130, 1023, 15, 2, wacom_intuos_irq },

@@ -452,6 +453,7 @@
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x10) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x11) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) },
+	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x13) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) },

Vojtech Pavlik

Applied

2004-01-24 08:29 UTC #1 lore raw

Quoted 8 lines · Panagiotis Issaris

Hi,
I got a Wacom Graphire3 for my birthday and unfortunately it didn't work. After some playing around, I noticed the 2.6 kernel needs a few small modifications to make it work.
This simple patch adds support for the Wacom Graphire 3. It applies fine to both 2.6.2-rc1-mm2 and 2.6.2-rc1.

Thanks, applied to my tree. I suppose you'll be able to find it in 2.6.3.

Signature · 2 lines

Vojtech Pavlik
SuSE Labs, SuSE CR

Panagiotis Issaris

author

2004-01-24 12:15 UTC #2 lore raw

Hi,

Quoted 6 lines · Vojtech Pavlik

Quoted 2 lines · Panagiotis Issaris
Hi,

Quoted 10 lines

Quoted 5 lines
I got a Wacom Graphire3 for my birthday and unfortunately it didn't work. After some playing around, I noticed the 2.6 kernel needs a few small modifications to make it work.
This simple patch adds support for the Wacom Graphire 3. It applies fine to both 2.6.2-rc1-mm2 and 2.6.2-rc1.
Thanks, applied to my tree. I suppose you'll be able to find it in 2.6.3.

Thanks! Unfortunately, there still was a problem regarding the height and width of the tablet. This patch fixes it. I've added both a new patch and an incremental one.

With friendly regards,
Takis

scratch/src/linux-2.6/drivers/usb/input/wacom.c +1 -1

diff -u /scratch/src/linux-2.6/drivers/usb/input/wacom.c /scratch/src/linux-2.6/drivers/usb/input/wacom.c
@@ -428,7 +428,7 @@
         { "Wacom Graphire",      8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
 	{ "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
  	{ "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 32, 1, wacom_graphire_irq },
- 	{ "Wacom Graphire3", 8,  13918, 10206,  511, 32, 1, wacom_graphire_irq },
+ 	{ "Wacom Graphire3", 8,  10208, 7424,  511, 32, 1, wacom_graphire_irq },
   	{ "Wacom Intuos 4x5",   10,  12700, 10360, 1023, 15, 2, wacom_intuos_irq },
  	{ "Wacom Intuos 6x8",   10,  20600, 16450, 1023, 15, 2, wacom_intuos_irq },
  	{ "Wacom Intuos 9x12",  10,  30670, 24130, 1023, 15, 2, wacom_intuos_irq },

scratch/src/linux-2.6/drivers/usb/input/hid-core.c renamed from drivers/usb/input/hid-core.c +1 -0

diff -ur linux-2.6.1/drivers/usb/input/hid-core.c /scratch/src/linux-2.6/drivers/usb/input/hid-core.c
@@ -1369,6 +1369,7 @@
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 1, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 2, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE + 3, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 1, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS + 2, HID_QUIRK_IGNORE },

scratch/src/linux-2.6/drivers/usb/input/wacom.c renamed from drivers/usb/input/wacom.c +2 -0

diff -ur linux-2.6.1/drivers/usb/input/wacom.c /scratch/src/linux-2.6/drivers/usb/input/wacom.c
@@ -428,6 +428,7 @@
         { "Wacom Graphire",      8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
 	{ "Wacom Graphire2 4x5", 8,  10206,  7422,  511, 32, 1, wacom_graphire_irq },
  	{ "Wacom Graphire2 5x7", 8,  13918, 10206,  511, 32, 1, wacom_graphire_irq },
+ 	{ "Wacom Graphire3", 8,  10208, 7424,  511, 32, 1, wacom_graphire_irq },
   	{ "Wacom Intuos 4x5",   10,  12700, 10360, 1023, 15, 2, wacom_intuos_irq },
  	{ "Wacom Intuos 6x8",   10,  20600, 16450, 1023, 15, 2, wacom_intuos_irq },
  	{ "Wacom Intuos 9x12",  10,  30670, 24130, 1023, 15, 2, wacom_intuos_irq },

@@ -452,6 +453,7 @@
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x10) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x11) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x12) },
+	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x13) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) },
 	{ USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) },

Vojtech Pavlik

Applied

2004-01-24 12:39 UTC #3 lore raw

Quoted 13 lines · Panagiotis Issaris

Quoted 4 lines
Quoted 4 lines
I got a Wacom Graphire3 for my birthday and unfortunately it didn't work. After some playing around, I noticed the 2.6 kernel needs a few small modifications to make it work.
Quoted 9 lines
Quoted 4 lines
This simple patch adds support for the Wacom Graphire 3. It applies fine to both 2.6.2-rc1-mm2 and 2.6.2-rc1.
Thanks, applied to my tree. I suppose you'll be able to find it in 2.6.3.

Quoted 6 lines

Thanks! Unfortunately, there still was a problem regarding the height and width of the tablet.
This patch fixes it. I've added both a new patch and an incremental one.
With friendly regards,
Takis

Thanks, applied.

Signature · 2 lines

Vojtech Pavlik
SuSE Labs, SuSE CR

Greg KH

2004-01-27 00:44 UTC #4 lore raw

In reply to Panagiotis Issaris

Quoted 8 lines · Panagiotis Issaris

Hi,
I got a Wacom Graphire3 for my birthday and unfortunately it didn't work. After some playing around, I noticed the 2.6 kernel needs a few small modifications to make it work.
This simple patch adds support for the Wacom Graphire 3. It applies fine to both 2.6.2-rc1-mm2 and 2.6.2-rc1.

This is already in 2.6.2-rc2.

thanks,

greg k-h