Deleted Added
full compact
main.c (302408) main.c (312318)
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: stable/11/sys/boot/i386/loader/main.c 298230 2016-04-18 23:09:22Z allanjude $");
28__FBSDID("$FreeBSD: stable/11/sys/boot/i386/loader/main.c 312318 2017-01-17 01:29:03Z emaste $");
29
30/*
31 * MD bootstrap main() and assorted miscellaneous
32 * commands.
33 */
34
35#include <stand.h>
36#include <stddef.h>

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

72struct geli_boot_args *gargs;
73#endif
74#ifdef LOADER_ZFS_SUPPORT
75struct zfs_boot_args *zargs;
76static void i386_zfs_probe(void);
77#endif
78
79/* from vers.c */
29
30/*
31 * MD bootstrap main() and assorted miscellaneous
32 * commands.
33 */
34
35#include <stand.h>
36#include <stddef.h>

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

72struct geli_boot_args *gargs;
73#endif
74#ifdef LOADER_ZFS_SUPPORT
75struct zfs_boot_args *zargs;
76static void i386_zfs_probe(void);
77#endif
78
79/* from vers.c */
80extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
80extern char bootprog_info[];
81
82/* XXX debugging */
83extern char end[];
84
85static void *heap_top;
86static void *heap_bottom;
87
88int

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

210 biosacpi_detect();
211
212 /* detect SMBIOS for future reference */
213 smbios_detect(NULL);
214
215 /* detect PCI BIOS for future reference */
216 biospci_detect();
217
81
82/* XXX debugging */
83extern char end[];
84
85static void *heap_top;
86static void *heap_bottom;
87
88int

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

210 biosacpi_detect();
211
212 /* detect SMBIOS for future reference */
213 smbios_detect(NULL);
214
215 /* detect PCI BIOS for future reference */
216 biospci_detect();
217
218 printf("\n");
219 printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
220 printf("(%s, %s)\n", bootprog_maker, bootprog_date);
218 printf("\n%s", bootprog_info);
221
222 extract_currdev(); /* set $currdev and $loaddev */
223 setenv("LINES", "24", 1); /* optional */
224
225 bios_getsmap();
226
227 interact(NULL);
228

--- 231 unchanged lines hidden ---
219
220 extract_currdev(); /* set $currdev and $loaddev */
221 setenv("LINES", "24", 1); /* optional */
222
223 bios_getsmap();
224
225 interact(NULL);
226

--- 231 unchanged lines hidden ---