[src/trunk]: src/sys/arch/i386/pci reserve AGP space to avoid resource conflict.

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

details:   https://anonhg.NetBSD.org/src/rev/58983c21039c
branches:  trunk
changeset: 495597:58983c21039c
user:      uch <uch%NetBSD.org@localhost>
date:      Tue Aug 01 05:23:59 2000 +0000

description:
reserve AGP space to avoid resource conflict.

diffstat:

 sys/arch/i386/pci/pci_addr_fixup.c |  13 +++++++------
 sys/arch/i386/pci/pcibios.c        |   4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r a5858e838b09 -r 58983c21039c sys/arch/i386/pci/pci_addr_fixup.c
--- a/sys/arch/i386/pci/pci_addr_fixup.c        Tue Aug 01 04:58:55 2000 +0000
+++ b/sys/arch/i386/pci/pci_addr_fixup.c        Tue Aug 01 05:23:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_addr_fixup.c,v 1.4 2000/07/18 11:18:04 soda Exp $  */
+/*     $NetBSD: pci_addr_fixup.c,v 1.5 2000/08/01 05:23:59 uch Exp $   */
 
 /*-
  * Copyright (c) 2000 UCHIYAMA Yasushi.  All rights reserved.
@@ -71,9 +71,9 @@
 #define PCIADDR_ISAMEM_RESERVE (16 * 1024 * 1024)
 
 void
-pci_addr_fixup(pc, bus)
+pci_addr_fixup(pc, maxbus)
        pci_chipset_tag_t pc;
-       int bus;
+       int maxbus;
 {
        extern paddr_t avail_end;
 #ifdef PCIBIOSVERBOSE
@@ -97,7 +97,7 @@
        }, *srp;
        paddr_t start;
        int error;
-       
+
        pciaddr.extent_mem = extent_create("PCI I/O memory space",
                                           PCIADDR_MEM_START, 
                                           PCIADDR_MEM_END,
@@ -113,7 +113,7 @@
         * 1. check & reserve system BIOS setting.
         */
        PCIBIOS_PRINTV((verbose_header, "System BIOS Setting"));
-       pci_device_foreach(pc, bus, pciaddr_resource_reserve);
+       pci_device_foreach(pc, maxbus, pciaddr_resource_reserve);
        PCIBIOS_PRINTV((verbose_footer, pciaddr.nbogus));
 
        /* 
@@ -149,7 +149,8 @@
         */
        PCIBIOS_PRINTV((verbose_header, "PCIBIOS fixup stage"));
        pciaddr.nbogus = 0;
-       pci_device_foreach(pc, bus, pciaddr_resource_allocate);
+       /* XXX bus #0 only. */
+       pci_device_foreach(pc, 0, pciaddr_resource_allocate);
        PCIBIOS_PRINTV((verbose_footer, pciaddr.nbogus));
 
 }
diff -r a5858e838b09 -r 58983c21039c sys/arch/i386/pci/pcibios.c
--- a/sys/arch/i386/pci/pcibios.c       Tue Aug 01 04:58:55 2000 +0000
+++ b/sys/arch/i386/pci/pcibios.c       Tue Aug 01 05:23:59 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcibios.c,v 1.4 2000/07/18 11:15:25 soda Exp $ */
+/*     $NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -214,7 +214,7 @@
 #endif
 
 #ifdef PCIBIOS_ADDR_FIXUP
-       pci_addr_fixup(NULL, 0); /* PCI bus #0 only */
+       pci_addr_fixup(NULL, pcibios_max_bus);
 #endif
 }