diff options
-rw-r--r-- | sys/arch/i386/i386/rbus_machdep.c | 3 | ||||
-rw-r--r-- | sys/arch/i386/pci/pci_addr_fixup.c | 3 | ||||
-rw-r--r-- | sys/arch/i386/pci/pci_addr_fixup.h | 40 | ||||
-rw-r--r-- | sys/arch/i386/pci/pcibios.c | 3 | ||||
-rw-r--r-- | sys/arch/i386/pci/pcibiosvar.h | 16 |
5 files changed, 17 insertions, 48 deletions
diff --git a/sys/arch/i386/i386/rbus_machdep.c b/sys/arch/i386/i386/rbus_machdep.c index b28eb7169bb..9d058a69911 100644 --- a/sys/arch/i386/i386/rbus_machdep.c +++ b/sys/arch/i386/i386/rbus_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.c,v 1.5 2000/11/21 14:23:33 aaron Exp $ */ +/* $OpenBSD: rbus_machdep.c,v 1.6 2001/01/24 23:40:25 mickey Exp $ */ /* $NetBSD: rbus_machdep.c,v 1.2 1999/10/15 06:43:06 haya Exp $ */ /* @@ -54,7 +54,6 @@ #include <dev/pci/pcivar.h> #include <arch/i386/pci/pcibiosvar.h> -#include <arch/i386/pci/pci_addr_fixup.h> diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c index 9faa92d11c7..eb63a9f4094 100644 --- a/sys/arch/i386/pci/pci_addr_fixup.c +++ b/sys/arch/i386/pci/pci_addr_fixup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_addr_fixup.c,v 1.5 2000/10/31 18:56:42 deraadt Exp $ */ +/* $OpenBSD: pci_addr_fixup.c,v 1.6 2001/01/24 23:40:28 mickey Exp $ */ /* $NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $ */ /*- @@ -41,7 +41,6 @@ #include <dev/pci/pcidevs.h> #include <i386/pci/pcibiosvar.h> -#include <i386/pci/pci_addr_fixup.h> struct pciaddr pciaddr; diff --git a/sys/arch/i386/pci/pci_addr_fixup.h b/sys/arch/i386/pci/pci_addr_fixup.h deleted file mode 100644 index f11329c3894..00000000000 --- a/sys/arch/i386/pci/pci_addr_fixup.h +++ /dev/null @@ -1,40 +0,0 @@ -/* $OpenBSD: pci_addr_fixup.h,v 1.1 2000/08/08 19:12:47 mickey Exp $ */ -/* $NetBSD: pci_addr_fixup.h,v 1.2 2000/05/31 16:38:55 uch Exp $ */ - -/*- - * Copyright (c) 2000 UCHIYAMA Yasushi. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -struct pciaddr { - struct extent *extent_mem; - struct extent *extent_port; - bus_addr_t mem_alloc_start; - bus_addr_t port_alloc_start; - int nbogus; -}; - -extern struct pciaddr pciaddr; - -void pci_addr_fixup __P((pci_chipset_tag_t, int)); diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c index cf98915ae90..a92b9ce7296 100644 --- a/sys/arch/i386/pci/pcibios.c +++ b/sys/arch/i386/pci/pcibios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcibios.c,v 1.18 2001/01/24 23:16:14 mickey Exp $ */ +/* $OpenBSD: pcibios.c,v 1.19 2001/01/24 23:40:29 mickey Exp $ */ /* $NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $ */ /* @@ -111,7 +111,6 @@ #include <i386/pci/pcibiosvar.h> #include <i386/pci/pci_intr_fixup.h> -#include <i386/pci/pci_addr_fixup.h> #include <machine/biosvar.h> diff --git a/sys/arch/i386/pci/pcibiosvar.h b/sys/arch/i386/pci/pcibiosvar.h index 6cb0a1b0745..0a6cc981c4a 100644 --- a/sys/arch/i386/pci/pcibiosvar.h +++ b/sys/arch/i386/pci/pcibiosvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcibiosvar.h,v 1.2 2001/01/24 23:16:14 mickey Exp $ */ +/* $OpenBSD: pcibiosvar.h,v 1.3 2001/01/24 23:40:29 mickey Exp $ */ /* $NetBSD: pcibios.h,v 1.2 2000/04/28 17:15:16 uch Exp $ */ /* @@ -95,6 +95,18 @@ extern struct pcibios_intr_routing *pcibios_pir_table; extern int pcibios_pir_table_nentries; extern int pcibios_max_bus; +struct pciaddr { + struct extent *extent_mem; + struct extent *extent_port; + bus_addr_t mem_alloc_start; + bus_addr_t port_alloc_start; + int nbogus; +}; + +extern struct pciaddr pciaddr; + +int pcibios_flags; + #ifdef PCIBIOSVERBOSE extern int pcibiosverbose; @@ -114,7 +126,7 @@ extern int pcibiosverbose; #endif int pci_bus_fixup __P((pci_chipset_tag_t, int)); +void pci_addr_fixup __P((pci_chipset_tag_t, int)); void pci_device_foreach __P((pci_chipset_tag_t, int, void (*) __P((pci_chipset_tag_t, pcitag_t)))); -int pcibios_flags; |