Deleted Added
full compact
autoconf.c (26267) autoconf.c (27288)
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 * $Id: autoconf.c,v 1.68 1997/05/11 18:05:36 tegge Exp $
37 * $Id: autoconf.c,v 1.2 1997/07/08 23:40:04 smp Exp smp $
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),

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

56#include <sys/kernel.h>
57#include <sys/mount.h>
58#include <sys/vnode.h>
59#include <sys/sysctl.h>
60
61#include <machine/bootinfo.h>
62#include <machine/cons.h>
63#include <machine/md_var.h>
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),

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

56#include <sys/kernel.h>
57#include <sys/mount.h>
58#include <sys/vnode.h>
59#include <sys/sysctl.h>
60
61#include <machine/bootinfo.h>
62#include <machine/cons.h>
63#include <machine/md_var.h>
64#if defined(APIC_IO)
64#ifdef APIC_IO
65#include <machine/smp.h>
66#endif /* APIC_IO */
65#include <machine/smp.h>
66#endif /* APIC_IO */
67
67#include <i386/isa/icu.h> /* For interrupts */
68
69#include "isa.h"
70#if NISA > 0
71#include <i386/isa/isa_device.h>
72#endif
73
74#include "eisa.h"

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

185configure(dummy)
186 void *dummy;
187{
188 int i;
189
190 configure_start();
191
192 /* Allow all routines to decide for themselves if they want intrs */
68#include <i386/isa/icu.h> /* For interrupts */
69
70#include "isa.h"
71#if NISA > 0
72#include <i386/isa/isa_device.h>
73#endif
74
75#include "eisa.h"

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

186configure(dummy)
187 void *dummy;
188{
189 int i;
190
191 configure_start();
192
193 /* Allow all routines to decide for themselves if they want intrs */
193#if defined(APIC_IO)
194 configure_local_apic();
195#endif /* APIC_IO */
194#ifdef APIC_IO
195 bsp_apic_configure();
196 enable_intr();
196 enable_intr();
197#if !defined(APIC_IO)
197#else
198 enable_intr();
198 INTREN(IRQ_SLAVE);
199 INTREN(IRQ_SLAVE);
199#endif /* !APIC_IO */
200#endif /* APIC_IO */
200
201#if NEISA > 0
202 eisa_configure();
203#endif
204
205#if NPCI > 0
206 pci_configure();
207#endif

--- 244 unchanged lines hidden ---
201
202#if NEISA > 0
203 eisa_configure();
204#endif
205
206#if NPCI > 0
207 pci_configure();
208#endif

--- 244 unchanged lines hidden ---