[src/trunk]: src/sys/arch/hp300/stand/common Also fix the apci device address...

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

details:   https://anonhg.NetBSD.org/src/rev/66faa9db34ef
branches:  trunk
changeset: 795649:66faa9db34ef
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Tue Apr 22 15:49:14 2014 +0000

description:
Also fix the apci device address in dnkbd.c as apci.c rev 1.12:

http://mail-index.netbsd.org/source-changes/2014/04/10/msg053940.html

Finally dnkbd(4) is confirmed working at least on bootloader.
Thanks again to Miod Vallat.

diffstat:

 sys/arch/hp300/stand/common/dnkbd.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 15e6f3dff949 -r 66faa9db34ef sys/arch/hp300/stand/common/dnkbd.c
--- a/sys/arch/hp300/stand/common/dnkbd.c       Tue Apr 22 15:27:50 2014 +0000
+++ b/sys/arch/hp300/stand/common/dnkbd.c       Tue Apr 22 15:49:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dnkbd.c,v 1.12 2008/04/28 20:23:19 martin Exp $        */
+/*     $NetBSD: dnkbd.c,v 1.13 2014/04/22 15:49:14 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -95,7 +95,8 @@
 dnkbd_getc(void)
 {
        struct apciregs *apci =
-           (struct apciregs *)IIOV(FRODO_BASE + FRODO_APCI_OFFSET(0));
+           (struct apciregs *)IIOV(INTIOBASE + FRODO_BASE +
+           FRODO_APCI_OFFSET(0));
        int c;
 
        /* default to `no key' */
@@ -168,7 +169,8 @@
         * Look for a Frodo utility chip.  If we find one, assume there
         * is a Domain keyboard attached.
         */
-       if (badaddr((void *)IIOV(FRODO_BASE + FRODO_APCI_OFFSET(0))))
+       if (badaddr((void *)IIOV(INTIOBASE + FRODO_BASE +
+           FRODO_APCI_OFFSET(0))))
                return 0;
 
        /*