Deleted Added
full compact
conf.c (58713) conf.c (59087)
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 58713 2000-03-28 01:19:53Z jhb $
26 * $FreeBSD: head/sys/boot/i386/loader/conf.c 59087 2000-04-08 01:22:14Z ps $
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
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#if defined(LOADER_NFS_SUPPORT) && defined(LOADER_TFTP_SUPPORT)
45#error "Cannot have both tftp and nfs support yet."
46#endif
47
44/* Exported for libstand */
45struct devsw *devsw[] = {
46 &biosdisk,
48/* Exported for libstand */
49struct devsw *devsw[] = {
50 &biosdisk,
51#if defined(LOADER_NFS_SUPPORT) || defined(LOADER_TFTP_SUPPORT)
47 &pxedisk,
52 &pxedisk,
48 /* XXX network devices? */
53#endif
49 NULL
50};
51
52struct fs_ops *file_system[] = {
53 &ufs_fsops,
54 &dosfs_fsops,
55 &zipfs_fsops,
54 NULL
55};
56
57struct fs_ops *file_system[] = {
58 &ufs_fsops,
59 &dosfs_fsops,
60 &zipfs_fsops,
56 &pxe_fsops,
61#ifdef LOADER_NFS_SUPPORT
62 &nfs_fsops,
63#endif
64#ifdef LOADER_TFTP_SUPPORT
65 &tftp_fsops,
66#endif
57 NULL
58};
59
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 */

--- 34 unchanged lines hidden ---
67 NULL
68};
69
70/* Exported for i386 only */
71/*
72 * Sort formats so that those that can detect based on arguments
73 * rather than reading the file go first.
74 */

--- 34 unchanged lines hidden ---