[src/trunk]: src/sys/arch/hp300 Attach apci console as an intio device, not a...

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

details:   https://anonhg.NetBSD.org/src/rev/ad0eb3ea8eb2
branches:  trunk
changeset: 525798:ad0eb3ea8eb2
user:      gmcgarry <gmcgarry%NetBSD.org@localhost>
date:      Wed Apr 17 20:40:30 2002 +0000

description:
Attach apci console as an intio device, not a dio device.
Fixes console attach on 425e noted by Thilo Manske.

diffstat:

 sys/arch/hp300/dev/apci.c       |  10 ++++------
 sys/arch/hp300/hp300/autoconf.c |  14 +++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diffs (84 lines):

diff -r 0a628deacceb -r ad0eb3ea8eb2 sys/arch/hp300/dev/apci.c
--- a/sys/arch/hp300/dev/apci.c Wed Apr 17 18:17:58 2002 +0000
+++ b/sys/arch/hp300/dev/apci.c Wed Apr 17 20:40:30 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: apci.c,v 1.15 2002/03/17 19:40:37 atatat Exp $ */
+/*     $NetBSD: apci.c,v 1.16 2002/04/17 20:40:30 gmcgarry Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apci.c,v 1.15 2002/03/17 19:40:37 atatat Exp $");                                                  
+__KERNEL_RCSID(0, "$NetBSD: apci.c,v 1.16 2002/04/17 20:40:30 gmcgarry Exp $");                                                  
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -113,9 +113,7 @@
 
 #include <dev/cons.h>
 
-#include <hp300/dev/dioreg.h>          /* to check for dca at 9 */
-#include <hp300/dev/diovar.h>
-#include <hp300/dev/diodevs.h>
+#include <hp300/dev/intiovar.h>
 
 #include <hp300/dev/frodoreg.h>
 #include <hp300/dev/frodovar.h>
@@ -904,7 +902,7 @@
        if (machineid != HP_425 || mmuid != MMUID_425_E)
                return (1);
 
-        if (bus_space_map(bst, addr, DIOCSIZE, 0, &bsh))
+        if (bus_space_map(bst, addr, INTIO_DEVSIZE, BUS_SPACE_MAP_LINEAR, &bsh))
                 return (1);
 
         va = bus_space_vaddr(bst, bsh);
diff -r 0a628deacceb -r ad0eb3ea8eb2 sys/arch/hp300/hp300/autoconf.c
--- a/sys/arch/hp300/hp300/autoconf.c   Wed Apr 17 18:17:58 2002 +0000
+++ b/sys/arch/hp300/hp300/autoconf.c   Wed Apr 17 20:40:30 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.56 2002/03/15 05:52:54 gmcgarry Exp $   */
+/*     $NetBSD: autoconf.c,v 1.57 2002/04/17 20:40:30 gmcgarry Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.56 2002/03/15 05:52:54 gmcgarry Exp $");                                                  
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.57 2002/04/17 20:40:30 gmcgarry Exp $");                                                  
 
 #include "hil.h"
 #include "dvbox.h"
@@ -796,14 +796,14 @@
        /*
         * Look for serial consoles first.
         */
+#if NAPCI > 0
+       if (!apcicnattach(HP300_BUS_SPACE_INTIO, 0x1c020, -1))
+               return;
+#endif
 #if NDCA > 0
        if (!dio_scan(dcacnattach))
                return;
 #endif
-#if NAPCI > 0
-       if (!dio_scan(apcicnattach))
-               return;
-#endif
 #if NDCM > 0
        if (!dio_scan(dcmcnattach))
                return;
@@ -830,7 +830,7 @@
        if (!topcatcnattach(HP300_BUS_SPACE_INTIO, 0x160000,-1))
                goto find_kbd;
 #endif
-#endif
+#endif /* CONSCODE */
 
        /*
         * Look for external framebuffers.