Deleted Added
full compact
conf.c (59854) conf.c (66133)
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 *
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 * $FreeBSD: head/sys/boot/i386/loader/conf.c 59854 2000-05-01 17:41:25Z bp $
26 * $FreeBSD: head/sys/boot/i386/loader/conf.c 66133 2000-09-20 18:13:36Z archie $
27 */
28
29#include <stand.h>
30#include <bootstrap.h>
31#include "libi386/libi386.h"
32
33/*
34 * We could use linker sets for some or all of these, but

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

85/*
86 * Consoles
87 *
88 * We don't prototype these in libi386.h because they require
89 * data structures from bootstrap.h as well.
90 */
91extern struct console vidconsole;
92extern struct console comconsole;
27 */
28
29#include <stand.h>
30#include <bootstrap.h>
31#include "libi386/libi386.h"
32
33/*
34 * We could use linker sets for some or all of these, but

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

85/*
86 * Consoles
87 *
88 * We don't prototype these in libi386.h because they require
89 * data structures from bootstrap.h as well.
90 */
91extern struct console vidconsole;
92extern struct console comconsole;
93extern struct console nullconsole;
93
94struct console *consoles[] = {
95 &vidconsole,
96 &comconsole,
94
95struct console *consoles[] = {
96 &vidconsole,
97 &comconsole,
98 &nullconsole,
97 NULL
98};
99
100extern struct pnphandler isapnphandler;
101extern struct pnphandler biospnphandler;
102extern struct pnphandler biospcihandler;
103
104struct pnphandler *pnphandlers[] = {
105 &biospnphandler, /* should go first, as it may set isapnp_readport */
106 &isapnphandler,
107 &biospcihandler,
108 NULL
109};
99 NULL
100};
101
102extern struct pnphandler isapnphandler;
103extern struct pnphandler biospnphandler;
104extern struct pnphandler biospcihandler;
105
106struct pnphandler *pnphandlers[] = {
107 &biospnphandler, /* should go first, as it may set isapnp_readport */
108 &isapnphandler,
109 &biospcihandler,
110 NULL
111};