Deleted Added
full compact
main.c (146698) main.c (148006)
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/main.c 146698 2005-05-27 19:31:00Z jhb $");
28__FBSDID("$FreeBSD: head/sys/boot/i386/loader/main.c 148006 2005-07-14 19:52:22Z jkim $");
29
30/*
31 * MD bootstrap main() and assorted miscellaneous
32 * commands.
33 */
34
35#include <stand.h>
36#include <string.h>

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

139 if (initial_bootinfo != NULL) {
140 initial_bootinfo->bi_basemem = bios_basemem / 1024;
141 initial_bootinfo->bi_extmem = bios_extmem / 1024;
142 }
143
144 /* detect ACPI for future reference */
145 biosacpi_detect();
146
29
30/*
31 * MD bootstrap main() and assorted miscellaneous
32 * commands.
33 */
34
35#include <stand.h>
36#include <string.h>

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

139 if (initial_bootinfo != NULL) {
140 initial_bootinfo->bi_basemem = bios_basemem / 1024;
141 initial_bootinfo->bi_extmem = bios_extmem / 1024;
142 }
143
144 /* detect ACPI for future reference */
145 biosacpi_detect();
146
147 /* detect SMBIOS for future reference */
148 smbios_detect();
149
147 printf("\n");
148 printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
149 printf("(%s, %s)\n", bootprog_maker, bootprog_date);
150
151 extract_currdev(); /* set $currdev and $loaddev */
152 setenv("LINES", "24", 1); /* optional */
153
154 bios_getsmap();

--- 148 unchanged lines hidden ---
150 printf("\n");
151 printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
152 printf("(%s, %s)\n", bootprog_maker, bootprog_date);
153
154 extract_currdev(); /* set $currdev and $loaddev */
155 setenv("LINES", "24", 1); /* optional */
156
157 bios_getsmap();

--- 148 unchanged lines hidden ---