[src/trunk]: src/sys/arch/atari PCI_VGA_SIZE -> PCI_MEM_SIZE. (Plus some comm...

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

details:   https://anonhg.NetBSD.org/src/rev/79f0f29149a7
branches:  trunk
changeset: 510402:79f0f29149a7
user:      leo <leo%NetBSD.org@localhost>
date:      Mon May 28 06:43:19 2001 +0000

description:
PCI_VGA_SIZE -> PCI_MEM_SIZE. (Plus some comments on those constants).

diffstat:

 sys/arch/atari/atari/atari_init.c |  10 +++++-----
 sys/arch/atari/include/iomap.h    |  15 +++++++++++++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r 2b1e260174ca -r 79f0f29149a7 sys/arch/atari/atari/atari_init.c
--- a/sys/arch/atari/atari/atari_init.c Mon May 28 06:18:20 2001 +0000
+++ b/sys/arch/atari/atari/atari_init.c Mon May 28 06:43:19 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atari_init.c,v 1.54 2001/05/14 11:58:30 leo Exp $      */
+/*     $NetBSD: atari_init.c,v 1.55 2001/05/28 06:43:19 leo Exp $      */
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -298,9 +298,9 @@
         * If present, add pci areas
         */
        if (machineid & ATARI_HADES)
-               ptextra += btoc(PCI_CONF_SIZE + PCI_IO_SIZE + PCI_VGA_SIZE);
+               ptextra += btoc(PCI_CONF_SIZE + PCI_IO_SIZE + PCI_MEM_SIZE);
        if (machineid & ATARI_MILAN)
-               ptextra += btoc(PCI_IO_SIZE + PCI_VGA_SIZE);
+               ptextra += btoc(PCI_IO_SIZE + PCI_MEM_SIZE);
        ptextra += btoc(BOOTM_VA_POOL);
 
        /*
@@ -772,8 +772,8 @@
                pci_mem_addr  = ioaddr;
                /* Provide an uncached PCI address for the MILAN */
                pci_mem_uncached = ioaddr;
-               ioaddr       += PCI_VGA_SIZE;
-               epg           = &pg[btoc(PCI_VGA_SIZE)];
+               ioaddr       += PCI_MEM_SIZE;
+               epg           = &pg[btoc(PCI_MEM_SIZE)];
                pg_proto      = PCI_VGA_PHYS | PG_RW | PG_CI | PG_V;
                while(pg < epg) {
                        *pg++     = pg_proto;
diff -r 2b1e260174ca -r 79f0f29149a7 sys/arch/atari/include/iomap.h
--- a/sys/arch/atari/include/iomap.h    Mon May 28 06:18:20 2001 +0000
+++ b/sys/arch/atari/include/iomap.h    Mon May 28 06:43:19 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomap.h,v 1.9 2001/04/12 07:17:30 leo Exp $    */
+/*     $NetBSD: iomap.h,v 1.10 2001/05/28 06:43:20 leo Exp $   */
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -76,10 +76,21 @@
 #define        ISA_MEMSTART            (0x40000000L)
 #endif /* defined(_MILANHW_) */
 
+/*
+ * Pre-allocated PCI-memory regions (atari_init.c). We need those in the
+ * boot-stages.
+ * XXX: Can probably be reduced to only PCI_CONF_SIZE (Leo).
+ */
 #define PCI_CONF_SIZE  (4 * NBPG)
 #define PCI_IO_SIZE    (NBPG)
-#define PCI_VGA_SIZE   (32 * 1024)
+#define PCI_MEM_SIZE   (NBPG)
+
+#define        PCI_VGA_SIZE    (32 * 1024) /* XXX Leo: Only used by grfabs_et now. */
 
+/*
+ * See bootm_init()/bootm_alloc() in bus.c for the usage of this pool
+ * of pre-allocated VA-space.
+ */
 #define        BOOTM_VA_POOL   (32 * 8192)     /* Pre-allocated VA-space       */
 
 #define        AD_RAM          (0x000000L)     /* main memory                  */