[src/trunk]: src/sys/arch/macppc/dev Recognize PCMCIA eject button. (Tested ...

[tsubai <tsubai%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d8b3a69993d8
branches:  trunk
changeset: 476073:d8b3a69993d8
user:      tsubai <tsubai%NetBSD.org@localhost>
date:      Sun Sep 05 05:30:30 1999 +0000

description:
Recognize PCMCIA eject button.  (Tested on only PowerBook 2400.)

diffstat:

 sys/arch/macppc/dev/akbd.c      |  12 ++++++++++--
 sys/arch/macppc/dev/pm_direct.c |   4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r dd930757cb99 -r d8b3a69993d8 sys/arch/macppc/dev/akbd.c
--- a/sys/arch/macppc/dev/akbd.c        Sun Sep 05 03:05:55 1999 +0000
+++ b/sys/arch/macppc/dev/akbd.c        Sun Sep 05 05:30:30 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: akbd.c,v 1.8 1999/06/16 08:48:37 tsubai Exp $  */
+/*     $NetBSD: akbd.c,v 1.9 1999/09/05 05:30:30 tsubai Exp $  */
 
 /*
  * Copyright (C) 1998  Colin Wood
@@ -495,10 +495,18 @@
 
        type = press ? WSCONS_EVENT_KEY_DOWN : WSCONS_EVENT_KEY_UP;
 
-       if (key == 185) {       /* Caps Lock released */
+       switch (key) {
+       case 185:       /* Caps Lock released */
                type = WSCONS_EVENT_KEY_DOWN;
                wskbd_input(sc->sc_wskbddev, type, val);
                type = WSCONS_EVENT_KEY_UP;
+               break;
+       case 245:
+               pm_eject_pcmcia(0);
+               break;
+       case 244:
+               pm_eject_pcmcia(1);
+               break;
        }
 
        if (adb_polling)
diff -r dd930757cb99 -r d8b3a69993d8 sys/arch/macppc/dev/pm_direct.c
--- a/sys/arch/macppc/dev/pm_direct.c   Sun Sep 05 03:05:55 1999 +0000
+++ b/sys/arch/macppc/dev/pm_direct.c   Sun Sep 05 05:30:30 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pm_direct.c,v 1.7 1999/07/12 15:54:55 tsubai Exp $     */
+/*     $NetBSD: pm_direct.c,v 1.8 1999/09/05 05:30:30 tsubai Exp $     */
 
 /*
  * Copyright (C) 1997 Takashi Hamada
@@ -1267,7 +1267,7 @@
        p.command = PMU_EJECT_PCMCIA;
        p.num_data = 1;
        p.s_buf = p.r_buf = p.data;
-       p.data[0] = slot * 18;  /* XXX */
+       p.data[0] = 5 + slot;   /* XXX */
        pmgrop(&p);
 }