[PATCH] Add support for the Wacom Intuos 4 wireless

[PATCH] Add support for the Wacom Intuos 4 wireless

[Bastien Nocera]

Same command set as the Graphire Bluetooth tablet.

Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
 drivers/hid/hid-ids.h   |    1 +
 drivers/hid/hid-wacom.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 66a2ca8..21f360f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -456,6 +456,7 @@
 
 #define USB_VENDOR_ID_WACOM		0x056a
 #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81
+#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH	0xbd
 
 #define USB_VENDOR_ID_WISEGROUP		0x0925
 #define USB_DEVICE_ID_SMARTJOY_PLUS	0x0005
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 8d3b46f..91dbae3 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -256,7 +256,7 @@ static void wacom_remove(struct hid_device *hdev)
 
 static const struct hid_device_id wacom_devices[] = {
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
-
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, wacom_devices);
-- 
1.6.6.1

Re: [PATCH] Add support for the Wacom Intuos 4 wireless

[Jiri Kosina]

On Wed, 21 Apr 2010, Bastien Nocera wrote:

> Same command set as the Graphire Bluetooth tablet.
> 
> Signed-off-by: Bastien Nocera <hadess@hadess.net>
> ---
>  drivers/hid/hid-ids.h   |    1 +
>  drivers/hid/hid-wacom.c |    2 +-
>  2 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index 66a2ca8..21f360f 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -456,6 +456,7 @@
>  
>  #define USB_VENDOR_ID_WACOM		0x056a
>  #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81
> +#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH	0xbd
>  
>  #define USB_VENDOR_ID_WISEGROUP		0x0925
>  #define USB_DEVICE_ID_SMARTJOY_PLUS	0x0005
> diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
> index 8d3b46f..91dbae3 100644
> --- a/drivers/hid/hid-wacom.c
> +++ b/drivers/hid/hid-wacom.c
> @@ -256,7 +256,7 @@ static void wacom_remove(struct hid_device *hdev)
>  
>  static const struct hid_device_id wacom_devices[] = {
>  	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
> -
> +	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
>  	{ }
>  };
>  MODULE_DEVICE_TABLE(hid, wacom_devices);

Hi Bastien,

has this particular patch been tested?

How about addition of this VID/PID combination to hid_blacklist[]?

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: [PATCH] Add support for the Wacom Intuos 4 wireless

[Bastien Nocera]

On Wed, 2010-04-21 at 15:53 +0200, Jiri Kosina wrote:
<snip>
> Hi Bastien,
> 
> has this particular patch been tested?

ENOHARDWARE :(

But the specs I have say so.

> How about addition of this VID/PID combination to hid_blacklist[]?

My mistake, that needs to be done as well obviously.

Will send an updated patch shortly.

Cheers

Re: [PATCH] Add support for the Wacom Intuos 4 wireless

[Jiri Kosina]

On Wed, 21 Apr 2010, Bastien Nocera wrote:

> > How about addition of this VID/PID combination to hid_blacklist[]?
> 
> My mistake, that needs to be done as well obviously.
> 
> Will send an updated patch shortly.

No problem, I'll fix that up myself.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

[PATCH] Add support for the Wacom Intuos 4 wireless

[Bastien Nocera]

And to the HID blacklist.

Same command set as the Graphire Bluetooth tablet.

Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
 drivers/hid/hid-core.c  |    1 +
 drivers/hid/hid-ids.h   |    1 +
 drivers/hid/hid-wacom.c |    2 +-
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index b57e5f7..c0bf99a 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1360,6 +1360,7 @@ static const struct hid_device_id hid_blacklist[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_TWINHAN, USB_DEVICE_ID_TWINHAN_IR_REMOTE) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
 
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 66a2ca8..21f360f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -456,6 +456,7 @@
 
 #define USB_VENDOR_ID_WACOM		0x056a
 #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH	0x81
+#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH	0xbd
 
 #define USB_VENDOR_ID_WISEGROUP		0x0925
 #define USB_DEVICE_ID_SMARTJOY_PLUS	0x0005
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 8d3b46f..91dbae3 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -256,7 +256,7 @@ static void wacom_remove(struct hid_device *hdev)
 
 static const struct hid_device_id wacom_devices[] = {
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
-
+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
 	{ }
 };
 MODULE_DEVICE_TABLE(hid, wacom_devices);
-- 
1.6.6.1

Re: [PATCH] Add support for the Wacom Intuos 4 wireless

[Bastien Nocera]

On Wed, 2010-04-21 at 16:19 +0200, Jiri Kosina wrote:
> On Wed, 21 Apr 2010, Bastien Nocera wrote:
> 
> > > How about addition of this VID/PID combination to hid_blacklist[]?
> > 
> > My mistake, that needs to be done as well obviously.
> > 
> > Will send an updated patch shortly.
> 
> No problem, I'll fix that up myself.

Hmm, I did something stupid there. The Intuos 4 wireless uses a
different protocol from the Graphire wireless. Another driver will need
to be written...

Could you please revert that patch?

Cheers

Re: [PATCH] Add support for the Wacom Intuos 4 wireless

[Jiri Kosina]

On Wed, 30 Jun 2010, Bastien Nocera wrote:

> > > > How about addition of this VID/PID combination to hid_blacklist[]?
> > > 
> > > My mistake, that needs to be done as well obviously.
> > > 
> > > Will send an updated patch shortly.
> > 
> > No problem, I'll fix that up myself.
> 
> Hmm, I did something stupid there. The Intuos 4 wireless uses a
> different protocol from the Graphire wireless. Another driver will need
> to be written...
> 
> Could you please revert that patch?

Reverted, thanks for letting me know.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.