Changes in kernel/genarch/include/genarch/multiboot/multiboot.h [7ba16eb:6ecf5b8] in mainline

File:

• kernel/genarch/include/genarch/multiboot/multiboot.h (modified) (2 diffs)

kernel/genarch/include/genarch/multiboot/multiboot.h

@@ -36 +36 @@
 #define KERN_MULTIBOOT_H_
 
-#include <genarch/multiboot/multiboot_memmap_struct.h>
-#include <genarch/multiboot/multiboot_info_struct.h>
-
 #define MULTIBOOT_HEADER_MAGIC  0x1badb002
 #define MULTIBOOT_HEADER_FLAGS  0x00010003
 
 #define MULTIBOOT_LOADER_MAGIC  0x2badb002
-
-#define MULTIBOOT_INFO_FLAGS_MEM        0x01
-#define MULTIBOOT_INFO_FLAGS_BOOT       0x02
-#define MULTIBOOT_INFO_FLAGS_CMDLINE    0x04
-#define MULTIBOOT_INFO_FLAGS_MODS       0x08
-#define MULTIBOOT_INFO_FLAGS_SYMS1      0x10
-#define MULTIBOOT_INFO_FLAGS_SYMS2      0x20
-#define MULTIBOOT_INFO_FLAGS_MMAP       0x40
 
 #ifndef __ASM__
@@ -71 +60 @@
 } __attribute__((packed)) multiboot_module_t;
 
+/** Multiboot mmap structure */
+typedef struct {
+        uint32_t size;
+        e820memmap_t mm_info;
+} __attribute__((packed)) multiboot_memmap_t;
+
+/** Multiboot information structure */
+typedef struct {
+        uint32_t flags;
+        uint32_t mem_lower;
+        uint32_t mem_upper;
+        
+        uint32_t boot_device;
+        uint32_t cmdline;
+        
+        uint32_t mods_count;
+        mbaddr_t mods_addr;
+        
+        uint32_t syms[4];
+        
+        uint32_t mmap_length;
+        mbaddr_t mmap_addr;
+        
+        /* ... */
+} __attribute__((packed)) multiboot_info_t;
+
+enum multiboot_info_flags {
+        MULTIBOOT_INFO_FLAGS_MEM     = 0x01,
+        MULTIBOOT_INFO_FLAGS_BOOT    = 0x02,
+        MULTIBOOT_INFO_FLAGS_CMDLINE = 0x04,
+        MULTIBOOT_INFO_FLAGS_MODS    = 0x08,
+        MULTIBOOT_INFO_FLAGS_SYMS1   = 0x10,
+        MULTIBOOT_INFO_FLAGS_SYMS2   = 0x20,
+        MULTIBOOT_INFO_FLAGS_MMAP    = 0x40
+        
+        /* ... */
+};
+
 extern void multiboot_extract_command(char *, size_t, const char *);
 extern void multiboot_extract_argument(char *, size_t, const char *);