Deleted Added
full compact
bootinfo64.c (38764) bootinfo64.c (39178)
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.1.1.1 1998/08/21 03:17:41 msmith Exp $
26 * $Id: bootinfo.c,v 1.2 1998/09/03 02:10:09 msmith Exp $
27 */
28
29#include <sys/reboot.h>
30#include <stand.h>
31#include "bootstrap.h"
32
33
34/*

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

52int
53bi_getboothowto(char *kargs)
54{
55 char *cp;
56 int howto;
57 int active;
58 int i;
59
27 */
28
29#include <sys/reboot.h>
30#include <stand.h>
31#include "bootstrap.h"
32
33
34/*

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

52int
53bi_getboothowto(char *kargs)
54{
55 char *cp;
56 int howto;
57 int active;
58 int i;
59
60 /* Parse kargs */
60 howto = 0;
61 if (kargs != NULL) {
62 cp = kargs;
63 active = 0;
64 while (*cp != 0) {
65 if (!active && (*cp == '-')) {
66 active = 1;
67 } else if (active)

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

89 break;
90 case 'v':
91 howto |= RB_VERBOSE;
92 break;
93 default:
94 active = 0;
95 break;
96 }
61 howto = 0;
62 if (kargs != NULL) {
63 cp = kargs;
64 active = 0;
65 while (*cp != 0) {
66 if (!active && (*cp == '-')) {
67 active = 1;
68 } else if (active)

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

90 break;
91 case 'v':
92 howto |= RB_VERBOSE;
93 break;
94 default:
95 active = 0;
96 break;
97 }
98 active = 0;
99 cp++;
97 }
100 }
98 cp++;
99 }
101 }
102 /* get equivalents from the environment */
100 for (i = 0; howto_names[i].ev != NULL; i++)
101 if (getenv(howto_names[i].ev) != NULL)
102 howto |= howto_names[i].mask;
103 if (!strcmp(getenv("console"), "comconsole"))
104 howto |= RB_SERIAL;
105 return(howto);
106}
107

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

132 addr++;
133}
134
135/*
136 * Copy module-related data into the load area, where it can be
137 * used as a directory for loaded modules.
138 *
139 * Module data is presented in a self-describing format. Each datum
103 for (i = 0; howto_names[i].ev != NULL; i++)
104 if (getenv(howto_names[i].ev) != NULL)
105 howto |= howto_names[i].mask;
106 if (!strcmp(getenv("console"), "comconsole"))
107 howto |= RB_SERIAL;
108 return(howto);
109}
110

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

135 addr++;
136}
137
138/*
139 * Copy module-related data into the load area, where it can be
140 * used as a directory for loaded modules.
141 *
142 * Module data is presented in a self-describing format. Each datum
140 * is preceeded by a 16-bit identifier and a 16-bit size field.
143 * is preceeded by a 32-bit identifier and a 32-bit size field.
141 *
142 * Currently, the following data are saved:
143 *
144 * MOD_NAME (variable) module name (string)
145 * MOD_TYPE (variable) module type (string)
146 * MOD_ADDR sizeof(vm_offset_t) module load address
147 * MOD_SIZE sizeof(size_t) module size
148 * MOD_METADATA (variable) type-specific metadata

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

172#define MOD_METADATA(a, mm) { \
173 u_int32_t ident = ((MODINFO_METADATA | mm->md_type) << 16) + mm->md_size; \
174 vpbcopy(&ident, a, sizeof(ident)); \
175 a += sizeof(ident); \
176 vpbcopy(mm->md_data, a, mm->md_size); \
177 a += mm->md_size; \
178}
179
144 *
145 * Currently, the following data are saved:
146 *
147 * MOD_NAME (variable) module name (string)
148 * MOD_TYPE (variable) module type (string)
149 * MOD_ADDR sizeof(vm_offset_t) module load address
150 * MOD_SIZE sizeof(size_t) module size
151 * MOD_METADATA (variable) type-specific metadata

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

175#define MOD_METADATA(a, mm) { \
176 u_int32_t ident = ((MODINFO_METADATA | mm->md_type) << 16) + mm->md_size; \
177 vpbcopy(&ident, a, sizeof(ident)); \
178 a += sizeof(ident); \
179 vpbcopy(mm->md_data, a, mm->md_size); \
180 a += mm->md_size; \
181}
182
183#define MOD_END(a) { \
184 u_int32_t ident = 0; \
185 vpbcopy(&ident, a, sizeof(ident)); \
186 a += sizeof(ident); \
187 vpbcopy(&ident, a, sizeof(ident)); \
188 a += sizeof(ident); \
189}
190
180vm_offset_t
181bi_copymodules(vm_offset_t addr)
182{
183 struct loaded_module *mp;
184 struct module_metadata *md;
185
186 /* start with the first module on the list, should be the kernel */
187 for (mp = mod_findmodule(NULL, NULL); mp != NULL; mp = mp->m_next) {
188
191vm_offset_t
192bi_copymodules(vm_offset_t addr)
193{
194 struct loaded_module *mp;
195 struct module_metadata *md;
196
197 /* start with the first module on the list, should be the kernel */
198 for (mp = mod_findmodule(NULL, NULL); mp != NULL; mp = mp->m_next) {
199
189 MOD_NAME(addr, mp->m_name);
200 MOD_NAME(addr, mp->m_name); /* this field must come first */
190 MOD_TYPE(addr, mp->m_type);
191 MOD_ADDR(addr, mp->m_addr);
192 MOD_SIZE(addr, mp->m_size);
193 for (md = mp->m_metadata; md != NULL; md = md->md_next)
194 if (!(md->md_type & MODINFOMD_NOCOPY))
195 MOD_METADATA(addr, md);
196 }
201 MOD_TYPE(addr, mp->m_type);
202 MOD_ADDR(addr, mp->m_addr);
203 MOD_SIZE(addr, mp->m_size);
204 for (md = mp->m_metadata; md != NULL; md = md->md_next)
205 if (!(md->md_type & MODINFOMD_NOCOPY))
206 MOD_METADATA(addr, md);
207 }
208 MOD_END(addr);
197 return(addr);
198}
209 return(addr);
210}