Deleted Added
full compact
bootstrap.h (113161) bootstrap.h (114379)
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/common/bootstrap.h 113161 2003-04-06 06:28:08Z peter $
26 * $FreeBSD: head/sys/boot/common/bootstrap.h 114379 2003-05-01 03:56:30Z peter $
27 */
28
29#include <sys/types.h>
30#include <sys/queue.h>
31#include <sys/linker_set.h>
32
33/*
34 * Generic device specifier; architecture-dependant

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

205 size_t f_size; /* file size */
206 struct kernel_module *f_modules; /* list of modules if any */
207 struct preloaded_file *f_next; /* next file */
208};
209
210struct file_format
211{
212 /* Load function must return EFTYPE if it can't handle the module supplied */
27 */
28
29#include <sys/types.h>
30#include <sys/queue.h>
31#include <sys/linker_set.h>
32
33/*
34 * Generic device specifier; architecture-dependant

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

205 size_t f_size; /* file size */
206 struct kernel_module *f_modules; /* list of modules if any */
207 struct preloaded_file *f_next; /* next file */
208};
209
210struct file_format
211{
212 /* Load function must return EFTYPE if it can't handle the module supplied */
213 int (* l_load)(char *filename, vm_offset_t dest, struct preloaded_file **result);
213 int (* l_load)(char *filename, u_int64_t dest, struct preloaded_file **result);
214 /* Only a loader that will load a kernel (first module) should have an exec handler */
215 int (* l_exec)(struct preloaded_file *mp);
216};
217
218extern struct file_format *file_formats[]; /* supplied by consumer */
219extern struct preloaded_file *preloaded_files;
220
221int mod_load(char *name, struct mod_depend *verinfo, int argc, char *argv[]);

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

226struct file_metadata *file_findmetadata(struct preloaded_file *fp, int type);
227void file_discard(struct preloaded_file *fp);
228void file_addmetadata(struct preloaded_file *fp, int type, size_t size, void *p);
229int file_addmodule(struct preloaded_file *fp, char *modname, int version,
230 struct kernel_module **newmp);
231
232
233/* MI module loaders */
214 /* Only a loader that will load a kernel (first module) should have an exec handler */
215 int (* l_exec)(struct preloaded_file *mp);
216};
217
218extern struct file_format *file_formats[]; /* supplied by consumer */
219extern struct preloaded_file *preloaded_files;
220
221int mod_load(char *name, struct mod_depend *verinfo, int argc, char *argv[]);

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

226struct file_metadata *file_findmetadata(struct preloaded_file *fp, int type);
227void file_discard(struct preloaded_file *fp);
228void file_addmetadata(struct preloaded_file *fp, int type, size_t size, void *p);
229int file_addmodule(struct preloaded_file *fp, char *modname, int version,
230 struct kernel_module **newmp);
231
232
233/* MI module loaders */
234int elf_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result);
234#ifdef __elfN
235int __elfN(loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result);
236#endif
235
236/*
237 * Support for commands
238 */
239struct bootblk_command
240{
241 const char *c_name;
242 const char *c_desc;

--- 43 unchanged lines hidden ---
237
238/*
239 * Support for commands
240 */
241struct bootblk_command
242{
243 const char *c_name;
244 const char *c_desc;

--- 43 unchanged lines hidden ---