diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-06-23 23:19:47 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2002-06-23 23:19:47 +0000 |
| commit | 37ef5ce3a131e38f4e9791ed1300321439e02eb5 (patch) | |
| tree | e07d7eb3ec17b4686126d0990cd7847691a646dc /sys | |
| parent | 79b5e81a5e6f40642bb96c692f3be9a5cdd48f62 (diff) | |
make CAPS_IS_CONTROL a default. pvalchev ok
(translates weird ADB capslock keycode to more normal behavior)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/files.macppc | 7 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/akbd.c | 14 |
3 files changed, 8 insertions, 16 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 653984a421f..fa95c13cdc3 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.26 2002/06/18 04:21:39 itojun Exp $g +# $OpenBSD: GENERIC,v 1.27 2002/06/23 23:19:46 itojun Exp $g # # PPC GENERIC config file # @@ -102,7 +102,6 @@ gpio* at macobio? # GPIO, PMU interrupt router. gpio* at gpio? # GPIO, PMU interrupt router. aed* at adb? # ADB Event Device akbd* at adb? # ADB keyboard -#option CAPS_IS_CONTROL # for using CAPS as CONTROL wskbd* at akbd? console ? mux 1 ams* at adb? # ADB mouse diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc index f2a9ce505ab..6376e1e9435 100644 --- a/sys/arch/macppc/conf/files.macppc +++ b/sys/arch/macppc/conf/files.macppc @@ -1,4 +1,4 @@ -# $OpenBSD: files.macppc,v 1.9 2002/06/08 16:02:10 miod Exp $ +# $OpenBSD: files.macppc,v 1.10 2002/06/23 23:19:46 itojun Exp $ # # macppc-specific configuration info @@ -216,6 +216,11 @@ include "dev/pcmcia/files.pcmcia" # include "dev/usb/files.usb" +# +# Machine-independent IEEE1394 drivers +# +include "dev/ieee1394/files.ieee1394" + # Sun HME Ethernet controllers device hme: ether, ifnet, mii, ifmedia file dev/ic/hme.c diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c index 46b49e22eb4..e510576115e 100644 --- a/sys/arch/macppc/dev/akbd.c +++ b/sys/arch/macppc/dev/akbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: akbd.c,v 1.11 2002/06/18 03:32:41 itojun Exp $ */ +/* $OpenBSD: akbd.c,v 1.12 2002/06/23 23:19:46 itojun Exp $ */ /* $NetBSD: akbd.c,v 1.13 2001/01/25 14:08:55 tsubai Exp $ */ /* @@ -506,15 +506,12 @@ akbd_intr(event) { int key, press, val; int type; -#ifdef CAPS_IS_CONTROL static int shift; -#endif struct akbd_softc *sc = akbd_cd.cd_devs[0]; key = event->u.k.key; -#ifdef CAPS_IS_CONTROL /* * Caps lock is weird. The key sequence generated is: * press: down(57) [57] (LED turns on) @@ -534,7 +531,6 @@ akbd_intr(event) shift = 0; } } -#endif press = ADBK_PRESS(key); val = ADBK_KEYVAL(key); @@ -542,14 +538,6 @@ akbd_intr(event) type = press ? WSCONS_EVENT_KEY_DOWN : WSCONS_EVENT_KEY_UP; switch (val) { -#ifndef CAPS_IS_CONTROL - case ADBK_CAPSLOCK: - type = WSCONS_EVENT_KEY_DOWN; - wskbd_input(sc->sc_wskbddev, type, val); - type = WSCONS_EVENT_KEY_UP; - break; -#endif - #if 0 /* not supported... */ case ADBK_KEYVAL(245): |