From 94d78d15691f3e6ac4c4797bb21ffcf8f9cc4a39 Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Mon, 15 Sep 2008 18:20:51 -0400 Subject: [PATCH] Split multiboot stuff into a header. --- grubload/multiboot_c.c | 19 ++----------------- include/multiboot.h | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 include/multiboot.h diff --git a/grubload/multiboot_c.c b/grubload/multiboot_c.c index 890a003..6fcfa5e 100644 --- a/grubload/multiboot_c.c +++ b/grubload/multiboot_c.c @@ -1,29 +1,14 @@ #include "console.h" #include #include +#include #define INFO_SIGNATURE 0x5754454E extern char _binary_realmode_bin_start[]; extern int _binary_realmode_bin_size; -struct mb_info -{ - unsigned long flags; - unsigned long mem_lower, mem_upper; - unsigned long boot_dev; - char *cmdline; - unsigned long mod_cnt; - struct mod_info *mods; -}; -struct mod_info -{ - void *mod_start; - void *mod_end; - char *mod_string; - void *reserved; -}; struct info_section { @@ -51,7 +36,7 @@ void c_start(unsigned int magic, struct mb_info *mbinfo) show_cursor(); puts("NetWatch loader\n"); - if (magic != 0x2BADB002) + if (magic != MULTIBOOT_LOADER_MAGIC) panic("Bootloader was not multiboot compliant; cannot continue."); for (i = 0; i < mbinfo->mod_cnt; i++) diff --git a/include/multiboot.h b/include/multiboot.h new file mode 100644 index 0000000..96f8819 --- /dev/null +++ b/include/multiboot.h @@ -0,0 +1,24 @@ +#ifndef __MULTIBOOT_H +#define __MULTIBOOT_H + +#define MULTIBOOT_LOADER_MAGIC 0x2BADB002 + +struct mb_info +{ + unsigned long flags; + unsigned long mem_lower, mem_upper; + unsigned long boot_dev; + char *cmdline; + unsigned long mod_cnt; + struct mod_info *mods; +}; + +struct mod_info +{ + void *mod_start; + void *mod_end; + char *mod_string; + void *reserved; +}; + +#endif -- 2.43.0