Deleted Added
full compact
conf.c (185029) conf.c (199855)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/boot/i386/loader/conf.c 185029 2008-11-17 20:49:29Z pjd $");
28__FBSDID("$FreeBSD: head/sys/boot/i386/loader/conf.c 199855 2009-11-27 03:55:42Z sobomax $");
29
30#include <stand.h>
31#include <bootstrap.h>
32#include "libi386/libi386.h"
33
34/*
35 * We could use linker sets for some or all of these, but
36 * then we would have to control what ended up linked into

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

123 * data structures from bootstrap.h as well.
124 */
125extern struct console vidconsole;
126extern struct console comconsole;
127#if defined(LOADER_FIREWIRE_SUPPORT)
128extern struct console dconsole;
129#endif
130extern struct console nullconsole;
29
30#include <stand.h>
31#include <bootstrap.h>
32#include "libi386/libi386.h"
33
34/*
35 * We could use linker sets for some or all of these, but
36 * then we would have to control what ended up linked into

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

123 * data structures from bootstrap.h as well.
124 */
125extern struct console vidconsole;
126extern struct console comconsole;
127#if defined(LOADER_FIREWIRE_SUPPORT)
128extern struct console dconsole;
129#endif
130extern struct console nullconsole;
131extern struct console spinconsole;
131
132struct console *consoles[] = {
133 &vidconsole,
134 &comconsole,
135#if defined(LOADER_FIREWIRE_SUPPORT)
136 &dconsole,
137#endif
138 &nullconsole,
132
133struct console *consoles[] = {
134 &vidconsole,
135 &comconsole,
136#if defined(LOADER_FIREWIRE_SUPPORT)
137 &dconsole,
138#endif
139 &nullconsole,
140 &spinconsole,
139 NULL
140};
141
142extern struct pnphandler isapnphandler;
143extern struct pnphandler biospnphandler;
144extern struct pnphandler biospcihandler;
145
146struct pnphandler *pnphandlers[] = {
147 &biospnphandler, /* should go first, as it may set isapnp_readport */
148 &isapnphandler,
149 &biospcihandler,
150 NULL
151};
141 NULL
142};
143
144extern struct pnphandler isapnphandler;
145extern struct pnphandler biospnphandler;
146extern struct pnphandler biospcihandler;
147
148struct pnphandler *pnphandlers[] = {
149 &biospnphandler, /* should go first, as it may set isapnp_readport */
150 &isapnphandler,
151 &biospcihandler,
152 NULL
153};