>Number:         35111
>Category:       kern
>Synopsis:       tiny patch to support Wacom Graphire3 6x8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Nov 24 18:25:00 +0000 2006
>Originator:     Brian de Alwis
>Release:        NetBSD 4.99.4
>Organization:
  Brian de Alwis | Software Practices Lab | UBC | http://www.cs.ubc.ca/~bsd/
      "Amusement to an observing mind is study." - Benjamin Disraeli
>Environment:
System: NetBSD monolith 4.99.4 NetBSD 4.99.4 (LAPTOP.MPACPI) #7: Fri Nov 24 11:06:45 CST 2006 bsd@monolith:/usr/obj/sys/arch/i386/compile/LAPTOP.MPACPI i386
Architecture: i386
Machine: i386
>Description:
	The Wacom Graphire3 6x8 tablet doesn't work under -current.
	It has the same problem as the Graphire 4x5 reported in
	kern/23965.  Supporting the 6x8 requires only a tiny patch.
>How-To-Repeat:
>Fix:
Index: ugraphire_rdesc.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ugraphire_rdesc.h,v
retrieving revision 1.4
diff -w -b -u -r1.4 ugraphire_rdesc.h
--- ugraphire_rdesc.h	11 Dec 2005 12:24:01 -0000	1.4
+++ ugraphire_rdesc.h	24 Nov 2006 18:17:00 -0000
@@ -90,6 +90,7 @@
     0xc0,                          /*  END_COLLECTION			*/
 };
 
+/* for the 6x8 too */
 static const uByte uhid_graphire3_4x5_report_descr[] = {
     0x05, 0x01,                    /* USAGE_PAGE (Generic Desktop)	*/
     0x09, 0x02,                    /* USAGE (Mouse)			*/
Index: uhidev.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/uhidev.c,v
retrieving revision 1.32
diff -w -b -u -r1.32 uhidev.c
--- uhidev.c	12 Jun 2006 21:01:58 -0000	1.32
+++ uhidev.c	24 Nov 2006 18:17:00 -0000
@@ -188,7 +188,8 @@
 			descptr = uhid_graphire_report_descr;
 			break;
 
-		case USB_PRODUCT_WACOM_GRAPHIRE3_4X5: /* The 6x8 too? */
+		case USB_PRODUCT_WACOM_GRAPHIRE3_4X5:
+		case USB_PRODUCT_WACOM_GRAPHIRE3_6x8:
 			/*
 			 * The Graphire3 needs 0x0202 to be written to
 			 * feature report ID 2 before it'll start
Index: usbdevs
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs,v
retrieving revision 1.442
diff -w -b -u -r1.442 usbdevs
--- usbdevs	22 Nov 2006 17:57:40 -0000	1.442
+++ usbdevs	24 Nov 2006 18:17:00 -0000
@@ -2013,6 +2013,7 @@
 product WACOM CT0405U		0x0000	CT-0405-U Tablet
 product WACOM GRAPHIRE		0x0010	Graphire
 product WACOM GRAPHIRE3_4X5	0x0013	Graphire3 4x5
+product WACOM GRAPHIRE3_6x8	0x0014	Graphire3 6x8
 product WACOM INTUOSA5		0x0021	Intuos A5
 product WACOM GD0912U		0x0022	Intuos 9x12 Graphics Tablet