summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorghen <ghen@NetBSD.org>2007-01-22 19:39:37 +0000
committerghen <ghen@NetBSD.org>2007-01-22 19:39:37 +0000
commitf391a807d64dfac7f5493a9548940b58eead2259 (patch)
tree3deadd2072771c2eaf2bc72b8697187d966bce13 /sys/dev
parent12d4fbef5e5f251690cf42049b727f7bf0c38b5c (diff)
Add ID's for the Graphire3 6x8 (from PR 35111) and Graphire4 4x5 (tested by
myself).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/ugraphire_rdesc.h3
-rw-r--r--sys/dev/usb/uhidev.c8
-rw-r--r--sys/dev/usb/usbdevs4
3 files changed, 10 insertions, 5 deletions
diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/dev/usb/ugraphire_rdesc.h
index 101941c671c..3040e09f448 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/dev/usb/ugraphire_rdesc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ugraphire_rdesc.h,v 1.4 2005/12/11 12:24:01 christos Exp $ */
+/* $NetBSD: ugraphire_rdesc.h,v 1.5 2007/01/22 19:39:37 ghen Exp $ */
/*
* Copyright (c) 2000 Nick Hibma <n_hibma@freebsd.org>
* All rights reserved.
@@ -90,6 +90,7 @@ static const uByte uhid_graphire_report_descr[] = {
0xc0, /* END_COLLECTION */
};
+/* Tested with Graphire3 4x5 and 6x8, and Graphire4 4x6 */
static const uByte uhid_graphire3_4x5_report_descr[] = {
0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */
0x09, 0x02, /* USAGE (Mouse) */
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 2f39cbc0431..b3c175a3c9f 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.32 2006/06/12 21:01:58 christos Exp $ */
+/* $NetBSD: uhidev.c,v 1.33 2007/01/22 19:39:37 ghen Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.32 2006/06/12 21:01:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.33 2007/01/22 19:39:37 ghen Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,7 +188,9 @@ USB_ATTACH(uhidev)
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:
+ case USB_PRODUCT_WACOM_GRAPHIRE4_4X5: /* The 6x8 too? */
/*
* The Graphire3 needs 0x0202 to be written to
* feature report ID 2 before it'll start
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 8bb74dbbf6d..1a64b24101b 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.449 2007/01/21 07:10:50 apb Exp $
+$NetBSD: usbdevs,v 1.450 2007/01/22 19:39:37 ghen Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -2026,6 +2026,8 @@ product VTECH RT2570 0x3012 RT2570
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 GRAPHIRE4_4X5 0x0015 Graphire4 4x5
product WACOM INTUOSA5 0x0021 Intuos A5
product WACOM GD0912U 0x0022 Intuos 9x12 Graphics Tablet