[src/trunk]: src/sys/arch Update for BATU()/BATL() changes.

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

details:   https://anonhg.NetBSD.org/src/rev/fc6c07ff1c64
branches:  trunk
changeset: 479686:fc6c07ff1c64
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Dec 18 01:37:00 1999 +0000

description:
Update for BATU()/BATL() changes.

diffstat:

 sys/arch/bebox/bebox/machdep.c        |  22 ++++++++++++----------
 sys/arch/macppc/macppc/machdep.c      |  24 +++++++++++++-----------
 sys/arch/macppc/macppc/rbus_machdep.c |   6 +++---
 sys/arch/ofppc/ofppc/machdep.c        |   6 +++---
 4 files changed, 31 insertions(+), 27 deletions(-)

diffs (130 lines):

diff -r 749c9e02cfc1 -r fc6c07ff1c64 sys/arch/bebox/bebox/machdep.c
--- a/sys/arch/bebox/bebox/machdep.c    Sat Dec 18 01:36:06 1999 +0000
+++ b/sys/arch/bebox/bebox/machdep.c    Sat Dec 18 01:37:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.45 1999/12/04 21:20:17 ragge Exp $       */
+/*     $NetBSD: machdep.c,v 1.46 1999/12/18 01:37:00 thorpej Exp $     */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -242,15 +242,17 @@
        /*
         * Set up initial BAT table
         */
-       /* map the lowest 256 MB area */
-       battable[0].batl = BATL(0x00000000, BAT_M);
-       battable[0].batu = BATU(0x00000000);
-       /* map the PCI/ISA I/O 256 MB area */
-       battable[1].batl = BATL(BEBOX_BUS_SPACE_IO, BAT_I);
-       battable[1].batu = BATU(BEBOX_BUS_SPACE_IO);
-       /* map the PCI/ISA MEMORY 256 MB area */
-       battable[2].batl = BATL(BEBOX_BUS_SPACE_MEM, BAT_I);
-       battable[2].batu = BATU(BEBOX_BUS_SPACE_MEM);
+       /* map the lowest 256M area */
+       battable[0].batl = BATL(0x00000000, BAT_M, BAT_PP_RW);
+       battable[0].batu = BATU(0x00000000, BAT_BL_256M, BAT_Vs);
+
+       /* map the PCI/ISA I/O 256M area */
+       battable[1].batl = BATL(BEBOX_BUS_SPACE_IO, BAT_I, BAT_PP_RW);
+       battable[1].batu = BATU(BEBOX_BUS_SPACE_IO, BAT_BL_256M, BAT_Vs);
+
+       /* map the PCI/ISA MEMORY 256M area */
+       battable[2].batl = BATL(BEBOX_BUS_SPACE_MEM, BAT_I, BAT_PP_RW);
+       battable[2].batu = BATU(BEBOX_BUS_SPACE_MEM, BAT_BL_256M, BAT_Vs);
 
        /*
         * Now setup fixed bat registers
diff -r 749c9e02cfc1 -r fc6c07ff1c64 sys/arch/macppc/macppc/machdep.c
--- a/sys/arch/macppc/macppc/machdep.c  Sat Dec 18 01:36:06 1999 +0000
+++ b/sys/arch/macppc/macppc/machdep.c  Sat Dec 18 01:37:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.62 1999/12/04 21:20:47 ragge Exp $       */
+/*     $NetBSD: machdep.c,v 1.63 1999/12/18 01:37:00 thorpej Exp $     */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -167,23 +167,23 @@
        /*
         * Set up BAT0 to only map the lowest 256 MB area
         */
-       battable[0].batl = BATL(0x00000000, BAT_M);
-       battable[0].batu = BATU(0x00000000);
+       battable[0].batl = BATL(0x00000000, BAT_M, BAT_PP_RW);
+       battable[0].batu = BATU(0x00000000, BAT_BL_256M, BAT_Vs);
 
        /*
         * Map PCI memory space.
         */
-       battable[8].batl = BATL(0x80000000, BAT_I);
-       battable[8].batu = BATU(0x80000000);
+       battable[8].batl = BATL(0x80000000, BAT_I, BAT_PP_RW);
+       battable[8].batu = BATU(0x80000000, BAT_BL_256M, BAT_Vs);
 
-       battable[9].batl = BATL(0x90000000, BAT_I);
-       battable[9].batu = BATU(0x90000000);
+       battable[9].batl = BATL(0x90000000, BAT_I, BAT_PP_RW);
+       battable[9].batu = BATU(0x90000000, BAT_BL_256M, BAT_Vs);
 
        /*
         * Map obio devices.
         */
-       battable[0xf].batl = BATL(0xf0000000, BAT_I);
-       battable[0xf].batu = BATU(0xf0000000);
+       battable[0xf].batl = BATL(0xf0000000, BAT_I, BAT_PP_RW);
+       battable[0xf].batu = BATU(0xf0000000, BAT_BL_256M, BAT_Vs);
 
        /*
         * Now setup fixed bat registers
@@ -331,8 +331,10 @@
        pmap_bootstrap(startkernel, endkernel);
 
        restore_ofw_mapping();
-       battable[msgbuf_paddr >> 28].batl = BATL(msgbuf_paddr, BAT_M);
-       battable[msgbuf_paddr >> 28].batu = BATU(msgbuf_paddr);
+       battable[msgbuf_paddr >> 28].batl = BATL(msgbuf_paddr, BAT_M,
+           BAT_PP_RW);
+       battable[msgbuf_paddr >> 28].batu = BATU(msgbuf_paddr, BAT_BL_256M,
+           BAT_Vs);
 }
 
 static int N_mapping;
diff -r 749c9e02cfc1 -r fc6c07ff1c64 sys/arch/macppc/macppc/rbus_machdep.c
--- a/sys/arch/macppc/macppc/rbus_machdep.c     Sat Dec 18 01:36:06 1999 +0000
+++ b/sys/arch/macppc/macppc/rbus_machdep.c     Sat Dec 18 01:37:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.2 1999/10/15 07:20:43 tsubai Exp $  */
+/*     $NetBSD: rbus_machdep.c,v 1.3 1999/12/18 01:37:00 thorpej Exp $ */
 
 /*
  * Copyright (c) 1999
@@ -102,8 +102,8 @@
                size  = 0x10000000;
        }
 
-       battable[start >> 28].batl = BATL(start, BAT_I);
-       battable[start >> 28].batu = BATU(start);
+       battable[start >> 28].batl = BATL(start, BAT_I, BAT_PP_RW);
+       battable[start >> 28].batu = BATU(start, BAT_BL_256M, BAT_Vs);
 
        return rbus_new_root_delegate(pa->pa_memt, start, size, 0);
 }
diff -r 749c9e02cfc1 -r fc6c07ff1c64 sys/arch/ofppc/ofppc/machdep.c
--- a/sys/arch/ofppc/ofppc/machdep.c    Sat Dec 18 01:36:06 1999 +0000
+++ b/sys/arch/ofppc/ofppc/machdep.c    Sat Dec 18 01:37:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.48 1999/12/04 21:21:09 ragge Exp $       */
+/*     $NetBSD: machdep.c,v 1.49 1999/12/18 01:37:00 thorpej Exp $     */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -173,8 +173,8 @@
        /*
         * Set up initial BAT table to only map the lowest 256 MB area
         */
-       battable[0].batl = BATL(0x00000000, BAT_M);
-       battable[0].batu = BATU(0x00000000);
+       battable[0].batl = BATL(0x00000000, BAT_M, BAT_PP_RW);
+       battable[0].batu = BATU(0x00000000, BAT_BL_256M, BAT_Vs);
 
        /*
         * Now setup fixed bat registers