Deleted Added
full compact
conf.c (39178) conf.c (39441)
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 * $Id: conf.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
26 * $Id: conf.c,v 1.2 1998/09/14 18:27:06 msmith Exp $
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
35 * then we would have to control what ended up linked into
36 * the bootstrap. So it's easier to conditionalise things
37 * here.
38 *
39 * XXX rename these arrays to be consistent and less namespace-hostile
40 *
41 * XXX as libi386 and biosboot merge, some of these can become linker sets.
42 */
43
44/* Exported for libstand */
45struct devsw *devsw[] = {
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
35 * then we would have to control what ended up linked into
36 * the bootstrap. So it's easier to conditionalise things
37 * here.
38 *
39 * XXX rename these arrays to be consistent and less namespace-hostile
40 *
41 * XXX as libi386 and biosboot merge, some of these can become linker sets.
42 */
43
44/* Exported for libstand */
45struct devsw *devsw[] = {
46 &biosdisk,
46/* &biosdisk, XXX BTX */
47 /* XXX network devices? */
48 NULL
49};
50
51struct fs_ops *file_system[] = {
52 &ufs_fsops,
53#if notyet
54 &dosfs_fsops,

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

60/* Exported for i386 only */
61/*
62 * Sort formats so that those that can detect based on arguments
63 * rather than reading the file go first.
64 */
65extern struct module_format i386_aout;
66
67struct module_format *module_formats[] = {
47 /* XXX network devices? */
48 NULL
49};
50
51struct fs_ops *file_system[] = {
52 &ufs_fsops,
53#if notyet
54 &dosfs_fsops,

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

60/* Exported for i386 only */
61/*
62 * Sort formats so that those that can detect based on arguments
63 * rather than reading the file go first.
64 */
65extern struct module_format i386_aout;
66
67struct module_format *module_formats[] = {
68 &i386_aout,
68/* &i386_aout, XXX BTX */
69 NULL
70};
71
72/*
73 * Consoles
74 *
75 * We don't prototype these in libi386.h because they require
76 * data structures from bootstrap.h as well.

--- 18 unchanged lines hidden ---
69 NULL
70};
71
72/*
73 * Consoles
74 *
75 * We don't prototype these in libi386.h because they require
76 * data structures from bootstrap.h as well.

--- 18 unchanged lines hidden ---