Deleted Added
full compact
bootinfo.c (44861) bootinfo.c (47727)
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: bootinfo.c,v 1.17 1999/03/08 11:05:52 dcs Exp $
26 * $Id: bootinfo.c,v 1.18 1999/03/18 14:36:22 dcs Exp $
27 */
28
29#include <stand.h>
30#include <sys/param.h>
31#include <sys/reboot.h>
32#include <sys/linker.h>
33#include <machine/bootinfo.h>
34#include "bootstrap.h"

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

42 * (kargs) and any relevant environment variables.
43 */
44static struct
45{
46 char *ev;
47 int mask;
48} howto_names[] = {
49 {"boot_askname", RB_ASKNAME},
27 */
28
29#include <stand.h>
30#include <sys/param.h>
31#include <sys/reboot.h>
32#include <sys/linker.h>
33#include <machine/bootinfo.h>
34#include "bootstrap.h"

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

42 * (kargs) and any relevant environment variables.
43 */
44static struct
45{
46 char *ev;
47 int mask;
48} howto_names[] = {
49 {"boot_askname", RB_ASKNAME},
50 {"boot_cdrom", RB_CDROM},
50 {"boot_userconfig", RB_CONFIG},
51 {"boot_ddb", RB_KDB},
52 {"boot_gdb", RB_GDB},
53 {"boot_single", RB_SINGLE},
54 {"boot_verbose", RB_VERBOSE},
55 {NULL, 0}
56};
57

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

74 } else if (active)
75 switch (*cp) {
76 case 'a':
77 howto |= RB_ASKNAME;
78 break;
79 case 'c':
80 howto |= RB_CONFIG;
81 break;
51 {"boot_userconfig", RB_CONFIG},
52 {"boot_ddb", RB_KDB},
53 {"boot_gdb", RB_GDB},
54 {"boot_single", RB_SINGLE},
55 {"boot_verbose", RB_VERBOSE},
56 {NULL, 0}
57};
58

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

75 } else if (active)
76 switch (*cp) {
77 case 'a':
78 howto |= RB_ASKNAME;
79 break;
80 case 'c':
81 howto |= RB_CONFIG;
82 break;
83 case 'C':
84 howto |= RB_CDROM;
85 break;
82 case 'd':
83 howto |= RB_KDB;
84 break;
85 case 'g':
86 howto |= RB_GDB;
87 break;
88 case 'h':
89 howto |= RB_SERIAL;

--- 236 unchanged lines hidden ---
86 case 'd':
87 howto |= RB_KDB;
88 break;
89 case 'g':
90 howto |= RB_GDB;
91 break;
92 case 'h':
93 howto |= RB_SERIAL;

--- 236 unchanged lines hidden ---