summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorbriggs <briggs@NetBSD.org>1997-10-02 15:12:49 +0000
committerbriggs <briggs@NetBSD.org>1997-10-02 15:12:49 +0000
commit407e2e622fa1ad129ab7e0c3462fb59edb39abae (patch)
treefa27b2220e21ddfc54eb409ce13d06f3de8fa42b /sys
parentac647185507cee04ed058df5199466e53f59e9cf (diff)
port-mac68k/4158: current kernel doesn't recognize some adb devices.
Patch applied. Thanks to SUNAGAWA Keiki for the change-request.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mac68k/dev/adbsys.c24
-rw-r--r--sys/arch/mac68k/include/adbsys.h8
2 files changed, 28 insertions, 4 deletions
diff --git a/sys/arch/mac68k/dev/adbsys.c b/sys/arch/mac68k/dev/adbsys.c
index c653abaa0b2..ce2094e37a8 100644
--- a/sys/arch/mac68k/dev/adbsys.c
+++ b/sys/arch/mac68k/dev/adbsys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adbsys.c,v 1.30 1997/08/11 22:53:28 scottr Exp $ */
+/* $NetBSD: adbsys.c,v 1.31 1997/10/02 15:12:54 briggs Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -420,13 +420,31 @@ adb_init()
}
break;
case ADBADDR_ABS:
- printf("absolute positioning device (tablet?) (%d)",
- adbdata.devType);
+ switch (adbdata.devType) {
+ case ADB_ARTPAD:
+ printf("WACOM ArtPad II");
+ break;
+ default:
+ printf("abs. pos. device (tablet?) (%d)",
+ adbdata.devType);
+ break;
+ }
break;
case ADBADDR_DATATX:
printf("data transfer device (modem?) (%d)",
adbdata.devType);
break;
+ case ADBADDR_MISC:
+ switch (adbdata.devType) {
+ case ADB_POWERKEY:
+ printf("Sophisticated Circuits PowerKey");
+ break;
+ default:
+ printf("misc. device (remote control?) (%d)",
+ adbdata.devType);
+ break;
+ }
+ break;
default:
printf("unknown type device, (def %d, handler %d)",
adbdata.origADBAddr, adbdata.devType);
diff --git a/sys/arch/mac68k/include/adbsys.h b/sys/arch/mac68k/include/adbsys.h
index 9733cc86b15..59cb1abcfeb 100644
--- a/sys/arch/mac68k/include/adbsys.h
+++ b/sys/arch/mac68k/include/adbsys.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adbsys.h,v 1.8 1997/08/09 20:21:53 ender Exp $ */
+/* $NetBSD: adbsys.h,v 1.9 1997/10/02 15:12:49 briggs Exp $ */
/*-
* Copyright (C) 1993, 1994 Allen K. Briggs, Chris P. Caputo,
@@ -123,6 +123,12 @@ typedef struct adb_dev_s{
#define ADBMS_EXTENDED 4 /* Extended mouse protocol */
#define ADBMS_USPEED 47 /* MicroSpeed mouse */
+ /* Interesting tablet handler ID */
+#define ADB_ARTPAD 58 /* WACOM ArtPad II tablet */
+
+ /* Interesting miscellaneous handler ID */
+#define ADB_POWERKEY 34 /* Sophisticated Circuits PowerKey */
+ /* (intelligent power tap) */
/* Get device info from ADB system */
typedef struct adb_devinfo_s{