[src/netbsd-1-5]: src/sys/arch/i386/i386 Pullup 1.10 [matt]:

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

details:   https://anonhg.NetBSD.org/src/rev/6abe8ca09bfd
branches:  netbsd-1-5
changeset: 489958:6abe8ca09bfd
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Oct 20 17:29:13 2000 +0000

description:
Pullup 1.10 [matt]:
Make the fixed hardcoded constant where cardbus allocates memory
for devices a variable which can be overriden by config file or
changed by ddb.

diffstat:

 sys/arch/i386/i386/rbus_machdep.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 0e0a46635bb8 -r 6abe8ca09bfd sys/arch/i386/i386/rbus_machdep.c
--- a/sys/arch/i386/i386/rbus_machdep.c Fri Oct 20 17:25:01 2000 +0000
+++ b/sys/arch/i386/i386/rbus_machdep.c Fri Oct 20 17:29:13 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.7 2000/06/09 10:31:07 haya Exp $    */
+/*     $NetBSD: rbus_machdep.c,v 1.7.2.1 2000/10/20 17:29:13 tv Exp $  */
 
 /*
  * Copyright (c) 1999
@@ -126,6 +126,11 @@
 
 
 
+#ifndef RBUS_MIN_START
+#define RBUS_MIN_START 0x40000000      /* 1GB */
+#endif
+bus_addr_t rbus_min_start = RBUS_MIN_START;
+
 /*
  * rbus_tag_t rbus_fakeparent_mem(struct pci_attach_args *pa)
  *
@@ -159,9 +164,8 @@
         * which do not recognised by the kernel are already reserved.
         */
 
-       if (start < 0x40000000) {
-               start = 0x40000000;     /* 1GB */
-       }
+       if (start < rbus_min_start) 
+               start = rbus_min_start;
 
        size = ex->ex_end - start;
        offset = 0;