diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-06-07 20:56:39 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-06-07 20:56:39 +0000 |
| commit | 8649aabba4e802e5c3c3ac6550f45026adfb258d (patch) | |
| tree | 4ab2638e647fcc89da921635344ee7897724b3b6 | |
| parent | d9b63853ed9ead8eec9d2bcf7bb784dba9e0d75a (diff) | |
Add wsconsctl recognition support for adb keyboard.
| -rw-r--r-- | sbin/wsconsctl/util.c | 5 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/ams.c | 9 | ||||
| -rw-r--r-- | sys/dev/wscons/wsconsio.h | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index 504fc7e856d..0db1556c752 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.11 2002/05/30 15:18:58 jason Exp $ */ +/* $OpenBSD: util.c,v 1.12 2002/06/07 20:56:38 drahn Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -77,7 +77,8 @@ static const struct nameint mstype_tab[] = { { WSMOUSE_TYPE_MMS, "mms" }, { WSMOUSE_TYPE_TPANEL, "touch-pannel" }, { WSMOUSE_TYPE_NEXT, "NeXT" }, - { WSMOUSE_TYPE_ARCHIMEDES, "archimedes" } + { WSMOUSE_TYPE_ARCHIMEDES, "archimedes" }, + { WSMOUSE_TYPE_ADB, "adb" } }; static const struct nameint dpytype_tab[] = { diff --git a/sys/arch/macppc/dev/ams.c b/sys/arch/macppc/dev/ams.c index eef607cdea9..5289c693e8f 100644 --- a/sys/arch/macppc/dev/ams.c +++ b/sys/arch/macppc/dev/ams.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ams.c,v 1.3 2002/03/14 01:26:36 millert Exp $ */ +/* $OpenBSD: ams.c,v 1.4 2002/06/07 20:56:38 drahn Exp $ */ /* $NetBSD: ams.c,v 1.11 2000/12/19 03:13:40 tsubai Exp $ */ /* @@ -544,6 +544,13 @@ ams_ioctl(v, cmd, data, flag, p) int flag; struct proc *p; { + switch (cmd) { + case WSMOUSEIO_GTYPE: + *(u_int *)data = WSMOUSE_TYPE_ADB; + return (0); + } + + return -1; } diff --git a/sys/dev/wscons/wsconsio.h b/sys/dev/wscons/wsconsio.h index e27c0135893..a8625b374f2 100644 --- a/sys/dev/wscons/wsconsio.h +++ b/sys/dev/wscons/wsconsio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsio.h,v 1.18 2002/05/29 20:43:44 maja Exp $ */ +/* $OpenBSD: wsconsio.h,v 1.19 2002/06/07 20:56:38 drahn Exp $ */ /* $NetBSD: wsconsio.h,v 1.31.2.1 2000/07/07 09:49:17 hannken Exp $ */ /* @@ -187,6 +187,7 @@ struct wskbd_map_data { #define WSMOUSE_TYPE_TPANEL 6 /* Generic Touch Panel */ #define WSMOUSE_TYPE_NEXT 7 /* NeXT mouse */ #define WSMOUSE_TYPE_ARCHIMEDES 8 /* Archimedes mouse */ +#define WSMOUSE_TYPE_ADB 9 /* ADB */ /* Set resolution. Not applicable to all mouse types. */ #define WSMOUSEIO_SRES _IOW('W', 33, u_int) |