NetBSD-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: kern/42570: Wacom's Graphire USB tablet does not bedistinguished from Graphire3 etc.
The following reply was made to PR kern/42570; it has been noted by GNATS.
From: Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: kern/42570: Wacom's Graphire USB tablet does not
bedistinguished from Graphire3 etc.
Date: Wed, 20 Jul 2011 05:30:47 +0900 (JST)
Hi,
From: Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>, Date: Tue, 19 Jul
2011 23:31:11 +0900
>> My explanation is not sufficient.
>>
>> The key is sending 0x2020 before using.
>> The current descriptor is wrong, but with only stylus works.
>> With 4D mouse, does not works.
>>
>> If NetBSD support fully Graphire, my description is needed.
>
> Only stylus works (but not 4D mouse) with the current descriptor?
Yes.
> Does 4D mouse work with the Graphire3's one?
Probably yes, but now I have no 4D mouse.
> If so it's okay to apply your changes, but it might be better to leave
> the old descriptor by wrapping #if 0/#endif and note the above
> description.
> (0x0202 should be written to feature report ID 2 even on
> the original Graphire etc.)
How about the following commit log candidate and patch?
=== === === === ===
* Graphire uses the descriptor as same as Graphire 3.
This is confirmed by USB analysis on Windows.
That is done with Wacom's official device driver and USB Snoopy.
* Old rev. 1.1 descriptor supports stylus only, probably 4D mouse
is not supported. Graphire 3's one probably supports 4D mouse.
* Graphire also needs 0x0202 sending.
=== === === === ===
Index: ugraphire_rdesc.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ugraphire_rdesc.h,v
retrieving revision 1.6
diff -u -r1.6 ugraphire_rdesc.h
--- ugraphire_rdesc.h 22 Jan 2007 19:48:57 -0000 1.6
+++ ugraphire_rdesc.h 19 Jul 2011 20:21:28 -0000
@@ -25,72 +25,13 @@
* SUCH DAMAGE.
*/
-static const uByte uhid_graphire_report_descr[] = {
- 0x05, 0x0d, /* USAGE_PAGE (Digitizers)
*/
- 0x09, 0x01, /* USAGE (Digitizer) */
- 0xa1, 0x01, /* COLLECTION (Application)
*/
- 0x85, 0x02, /* REPORT_ID (2)
*/
- 0x05, 0x0d, /* USAGE_PAGE (Digitizers) */
- 0x09, 0x01, /* USAGE (Digitizer) */
- 0xa1, 0x00, /* COLLECTION (Physical)
*/
- 0x15, 0x00, /* LOGICAL_MINIMUM (0)
*/
- 0x25, 0x01, /* LOGICAL_MAXIMUM (1)
*/
- 0x09, 0x33, /* USAGE (Touch) */
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0x75, 0x01, /* REPORT_SIZE (1) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0x09, 0x44, /* USAGE (Barrel Switch) */
- 0x95, 0x02, /* REPORT_COUNT (2) */
- 0x75, 0x01, /* REPORT_SIZE (1) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0x09, 0x00, /* USAGE (Undefined) */
- 0x95, 0x02, /* REPORT_COUNT (2) */
- 0x75, 0x01, /* REPORT_SIZE (1) */
- 0x81, 0x03, /* INPUT (Cnst,Var,Abs)
*/
- 0x09, 0x3c, /* USAGE (Invert) */
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0x75, 0x01, /* REPORT_SIZE (1) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0x09, 0x38, /* USAGE (Transducer Index) */
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0x75, 0x01, /* REPORT_SIZE (1) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0x09, 0x32, /* USAGE (In Range) */
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0x75, 0x01, /* REPORT_SIZE (1) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0x05, 0x01, /* USAGE_PAGE (Generic Desktop)
*/
- 0x09, 0x30, /* USAGE (X) */
- 0x15, 0x00, /* LOGICAL_MINIMUM (0)
*/
- 0x26, 0xde, 0x27, /* LOGICAL_MAXIMUM (10206) */
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0x75, 0x10, /* REPORT_SIZE (16) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0x09, 0x31, /* USAGE (Y) */
- 0x26, 0xfe, 0x1c, /* LOGICAL_MAXIMUM (7422) */
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0x75, 0x10, /* REPORT_SIZE (16) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0x05, 0x0d, /* USAGE_PAGE (Digitizers) */
- 0x09, 0x30, /* USAGE (Tip Pressure)
*/
- 0x26, 0xff, 0x01, /* LOGICAL_MAXIMUM (511) */
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0x75, 0x10, /* REPORT_SIZE (16) */
- 0x81, 0x02, /* INPUT (Data,Var,Abs)
*/
- 0xc0, /* END_COLLECTION
*/
- 0x05, 0x0d, /* USAGE_PAGE (Digitizers) */
- 0x09, 0x00, /* USAGE (Undefined) */
- 0x85, 0x02, /* REPORT_ID (2)
*/
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0xb1, 0x02, /* FEATURE (Data,Var,Abs)
*/
- 0x09, 0x00, /* USAGE (Undefined) */
- 0x85, 0x03, /* REPORT_ID (3)
*/
- 0x95, 0x01, /* REPORT_COUNT (1) */
- 0xb1, 0x02, /* FEATURE (Data,Var,Abs)
*/
- 0xc0, /* END_COLLECTION */
-};
-
-/* Tested with Graphire3 4x5 and 6x8, and Graphire4 4x5 */
+/* Tested with
+ * - Graphire
+ * - Graphire2
+ * - Graphire3 4x5
+ * - Graphire3 6x8
+ * - Graphire4 4x5
+ */
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.49
diff -u -r1.49 uhidev.c
--- uhidev.c 29 Jan 2011 14:20:18 -0000 1.49
+++ uhidev.c 19 Jul 2011 20:21:29 -0000
@@ -193,10 +193,6 @@
/* The report descriptor for the Wacom Graphire is broken. */
switch (uaa->product) {
case USB_PRODUCT_WACOM_GRAPHIRE:
- size = sizeof uhid_graphire_report_descr;
- descptr = uhid_graphire_report_descr;
- break;
-
case USB_PRODUCT_WACOM_GRAPHIRE2:
case USB_PRODUCT_WACOM_GRAPHIRE3_4X5:
case USB_PRODUCT_WACOM_GRAPHIRE3_6X8:
--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
Home |
Main Index |
Thread Index |
Old Index