[src/netbsd-1-4]: src/sys/arch/vax/boot/boot Pull up autoconf.c 1.2 and consi...

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

details:   https://anonhg.NetBSD.org/src/rev/cdb504d873c8
branches:  netbsd-1-4
changeset: 468233:cdb504d873c8
user:      ragge <ragge%NetBSD.org@localhost>
date:      Thu Apr 15 14:20:08 1999 +0000

description:
Pull up autoconf.c 1.2 and consio.c 1.3.

diffstat:

 sys/arch/vax/boot/boot/autoconf.c |  18 ++++++++++++++++--
 sys/arch/vax/boot/boot/consio.c   |   4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r e7230b8a4c35 -r cdb504d873c8 sys/arch/vax/boot/boot/autoconf.c
--- a/sys/arch/vax/boot/boot/autoconf.c Thu Apr 15 12:29:35 1999 +0000
+++ b/sys/arch/vax/boot/boot/autoconf.c Thu Apr 15 14:20:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.1 1999/03/06 16:36:05 ragge Exp $ */
+/*     $NetBSD: autoconf.c,v 1.1.2.1 1999/04/15 14:20:08 ragge Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -198,6 +198,20 @@
                break;
 
        case VAX_TYP_SOC:
+               switch (vax_boardtype) {
+               case VAX_BTYP_48: {
+                       int *map, i;
+
+                       /* Map all 16MB of I/O space to low 16MB of memory */
+                       map = (int *)0x700000; /* XXX */
+                       *(int *)0x20080008 = (int)map; /* XXX */
+                       for (i = 0; i < 0x8000; i++)
+                               map[i] = 0x80000000 | i;
+                       }
+                       clk_adrshift = 1;
+                       clk_tweak = 2;
+                       break;
+               }
                break;
 
        }
@@ -222,4 +236,4 @@
                ;
        return REGPEEK(SEC_OFF) + REGPEEK(MIN_OFF) * SEC_PER_MIN;
 
-}
+}
\ No newline at end of file
diff -r e7230b8a4c35 -r cdb504d873c8 sys/arch/vax/boot/boot/consio.c
--- a/sys/arch/vax/boot/boot/consio.c   Thu Apr 15 12:29:35 1999 +0000
+++ b/sys/arch/vax/boot/boot/consio.c   Thu Apr 15 14:20:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consio.c,v 1.2 1999/03/27 09:33:31 ragge Exp $ */
+/*     $NetBSD: consio.c,v 1.2.2.1 1999/04/15 14:20:08 ragge Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -172,7 +172,6 @@
        case VAX_BTYP_49:
        case VAX_BTYP_410:        
        case VAX_BTYP_420:
-       case VAX_BTYP_48:
                put_fp = rom_putchar;
                get_fp = rom_getchar;
                test_fp = rom_testchar;
@@ -185,6 +184,7 @@
                break;
 
        case VAX_BTYP_46:
+       case VAX_BTYP_48:
                put_fp = rom_putchar;
                get_fp = rom_getchar;
                test_fp = rom_testchar;