diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-03 18:01:26 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-03 18:01:26 -0200 |
| commit | af0758169e63a4e7f6024c241d9254a8bc09908d (patch) | |
| tree | a31903fc62c875e8d23a391beb8ae57ed0092c45 /sys/boot/common/bootstrap.h | |
| parent | 79f27b5150f7b79a6f1bcd30e9233f1abb9c3e36 (diff) | |
| parent | 6114d518f71115abacc5d610c4d668ef6e0b2f37 (diff) | |
| download | FreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.zip FreeBSD-src-af0758169e63a4e7f6024c241d9254a8bc09908d.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/boot/common/bootstrap.h')
| -rw-r--r-- | sys/boot/common/bootstrap.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h index de77c7b..8804f01 100644 --- a/sys/boot/common/bootstrap.h +++ b/sys/boot/common/bootstrap.h @@ -56,7 +56,10 @@ typedef int (bootblk_cmd_t)(int argc, char *argv[]); extern char *command_errmsg; extern char command_errbuf[]; /* XXX blah, length */ #define CMD_OK 0 -#define CMD_ERROR 1 +#define CMD_WARN 1 +#define CMD_ERROR 2 +#define CMD_CRIT 3 +#define CMD_FATAL 4 /* interp.c */ void interact(void); @@ -233,7 +236,7 @@ int mod_loadkld(const char *name, int argc, char *argv[]); struct preloaded_file *file_alloc(void); struct preloaded_file *file_findfile(const char *name, const char *type); struct file_metadata *file_findmetadata(struct preloaded_file *fp, int type); -struct preloaded_file *file_loadraw(char *name, char *type, int insert); +struct preloaded_file *file_loadraw(const char *name, char *type, int insert); void file_discard(struct preloaded_file *fp); void file_addmetadata(struct preloaded_file *fp, int type, size_t size, void *p); int file_addmodule(struct preloaded_file *fp, char *modname, int version, |
