diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c deleted file mode 100644 index c0819b457f8..00000000000 --- a/sys/amd64/amd64/autoconf.c +++ /dev/null @@ -1,125 +0,0 @@ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * William Jolitz. - * - * 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. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. - * - * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - */ - -#include -__FBSDID("$FreeBSD$"); - -/* - * Setup the system to run on the current machine. - * - * Configure() is called at boot time and initializes the vba - * device tables and the memory controller monitoring. Available - * devices are determined (from possibilities mentioned in ioconf.c), - * and the drivers are initialized. - */ -#include "opt_bootp.h" -#include "opt_isa.h" -#include "opt_bus.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -#ifdef DEV_ISA -#include - -device_t isa_bus_device = 0; -#endif - -static void configure_first(void *); -static void configure(void *); -static void configure_final(void *); - -SYSINIT(configure1, SI_SUB_CONFIGURE, SI_ORDER_FIRST, configure_first, NULL); -/* SI_ORDER_SECOND is hookable */ -SYSINIT(configure2, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL); -/* SI_ORDER_MIDDLE is hookable */ -SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL); - -/* - * Determine i/o configuration for a machine. - */ -static void -configure_first(dummy) - void *dummy; -{ - - /* nexus0 is the top of the amd64 device tree */ - device_add_child(root_bus, "nexus", 0); -} - -static void -configure(dummy) - void *dummy; -{ - - /* initialize new bus architecture */ - root_bus_configure(); - -#ifdef DEV_ISA - /* - * Explicitly probe and attach ISA last. The isa bus saves - * it's device node at attach time for us here. - */ - if (isa_bus_device) - isa_probe_children(isa_bus_device); -#endif -} - -static void -configure_final(dummy) - void *dummy; -{ - - cninit_finish(); - if (bootverbose) - printf("Device configuration finished.\n"); - cold = 0; -} diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index dd7f2beaffe..85366fa9804 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -104,7 +104,6 @@ acpi_wakedata.h optional acpi \ amd64/amd64/amd64_mem.c optional mem #amd64/amd64/apic_vector.S standard amd64/amd64/atomic.c standard -amd64/amd64/autoconf.c standard amd64/amd64/bios.c standard amd64/amd64/bpf_jit_machdep.c optional bpf_jitter amd64/amd64/cpu_switch.S standard @@ -596,6 +595,7 @@ x86/isa/nmi.c standard x86/isa/orm.c optional isa x86/pci/pci_bus.c optional pci x86/pci/qpi.c optional pci +x86/x86/autoconf.c standard x86/x86/bus_machdep.c standard x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 1947671b1d3..4b6f158decf 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -452,7 +452,6 @@ i386/bios/smapi_bios.S optional smapi #i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -i386/i386/autoconf.c standard i386/i386/bios.c standard i386/i386/bioscall.s standard i386/i386/bpf_jit_machdep.c optional bpf_jitter @@ -591,6 +590,7 @@ x86/isa/nmi.c standard x86/isa/orm.c optional isa x86/pci/pci_bus.c optional pci x86/pci/qpi.c optional pci +x86/x86/autoconf.c standard x86/x86/bus_machdep.c standard x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index c8b79de9c17..9f0ef002bdc 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -147,7 +147,6 @@ i386/bios/apm.c optional apm #i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -i386/i386/autoconf.c standard i386/i386/bios.c standard i386/i386/bioscall.s standard i386/i386/bpf_jit_machdep.c optional bpf_jitter @@ -258,6 +257,7 @@ x86/isa/atpic.c optional atpic x86/isa/clock.c standard x86/isa/isa.c optional isa x86/pci/pci_bus.c optional pci +x86/x86/autoconf.c standard x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard x86/x86/cpu_machdep.c standard diff --git a/sys/i386/i386/autoconf.c b/sys/x86/x86/autoconf.c similarity index 98% rename from sys/i386/i386/autoconf.c rename to sys/x86/x86/autoconf.c index 458b42ffda6..813fe4c9e28 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/x86/x86/autoconf.c @@ -65,7 +65,9 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef PC98 #include +#endif #include #ifdef DEV_ISA @@ -92,7 +94,7 @@ configure_first(dummy) void *dummy; { - /* nexus0 is the top of the i386 device tree */ + /* nexus0 is the top of the x86 device tree */ device_add_child(root_bus, "nexus", 0); }