Module Name: src
Committed By: tsutsui
Date: Tue Apr 22 15:49:14 UTC 2014
Modified Files:
src/sys/arch/hp300/stand/common: dnkbd.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/common/dnkbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/dnkbd.c
diff -u src/sys/arch/hp300/stand/common/dnkbd.c:1.12 src/sys/arch/hp300/stand/common/dnkbd.c:1.13
--- src/sys/arch/hp300/stand/common/dnkbd.c:1.12 Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/stand/common/dnkbd.c Tue Apr 22 15:49:14 2014
@@ -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 @@ int
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 @@ dnkbd_init(void)
* 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;
/*
