Deleted Added
full compact
autoconf.c (54073) autoconf.c (55117)
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
37 * $FreeBSD: head/sys/i386/i386/autoconf.c 54073 1999-12-03 08:41:24Z mdodd $
37 * $FreeBSD: head/sys/i386/i386/autoconf.c 55117 1999-12-26 16:21:19Z bde $
38 */
39
40/*
41 * Setup the system to run on the current machine.
42 *
43 * Configure() is called at boot time and initializes the vba
44 * device tables and the memory controller monitoring. Available
45 * devices are determined (from possibilities mentioned in ioconf.c),
46 * and the drivers are initialized.
47 */
48#include "opt_bootp.h"
49#include "opt_ffs.h"
50#include "opt_cd9660.h"
51#include "opt_nfs.h"
52#include "opt_nfsroot.h"
53#include "opt_bus.h"
54#include "opt_rootdevname.h"
55
38 */
39
40/*
41 * Setup the system to run on the current machine.
42 *
43 * Configure() is called at boot time and initializes the vba
44 * device tables and the memory controller monitoring. Available
45 * devices are determined (from possibilities mentioned in ioconf.c),
46 * and the drivers are initialized.
47 */
48#include "opt_bootp.h"
49#include "opt_ffs.h"
50#include "opt_cd9660.h"
51#include "opt_nfs.h"
52#include "opt_nfsroot.h"
53#include "opt_bus.h"
54#include "opt_rootdevname.h"
55
56#include "isa.h"
57
56#include <sys/param.h>
57#include <sys/systm.h>
58#include <sys/bus.h>
59#include <sys/conf.h>
60#include <sys/disklabel.h>
61#include <sys/diskslice.h>
62#include <sys/reboot.h>
63#include <sys/kernel.h>

--- 5 unchanged lines hidden (view full) ---

69#include <machine/ipl.h>
70#include <machine/md_var.h>
71#ifdef APIC_IO
72#include <machine/smp.h>
73#else
74#include <i386/isa/icu.h>
75#endif /* APIC_IO */
76
58#include <sys/param.h>
59#include <sys/systm.h>
60#include <sys/bus.h>
61#include <sys/conf.h>
62#include <sys/disklabel.h>
63#include <sys/diskslice.h>
64#include <sys/reboot.h>
65#include <sys/kernel.h>

--- 5 unchanged lines hidden (view full) ---

71#include <machine/ipl.h>
72#include <machine/md_var.h>
73#ifdef APIC_IO
74#include <machine/smp.h>
75#else
76#include <i386/isa/icu.h>
77#endif /* APIC_IO */
78
77#include "isa.h"
79#if NISA > 0
78#include <isa/isavar.h>
80#include <isa/isavar.h>
81
79device_t isa_bus_device = 0;
82device_t isa_bus_device = 0;
83#endif
80
81static void configure_first __P((void *));
82static void configure __P((void *));
83static void configure_final __P((void *));
84
85#if defined(FFS) && defined(FFS_ROOT)
86static void setroot __P((void));
87#endif

--- 235 unchanged lines hidden ---
84
85static void configure_first __P((void *));
86static void configure __P((void *));
87static void configure_final __P((void *));
88
89#if defined(FFS) && defined(FFS_ROOT)
90static void setroot __P((void));
91#endif

--- 235 unchanged lines hidden ---