Changes in kernel/genarch/include/multiboot/multiboot.h [d99c1d2:1f5c9c96] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/genarch/include/multiboot/multiboot.h
rd99c1d2 r1f5c9c96 36 36 #define KERN_MULTIBOOT_H_ 37 37 38 #define MULTIBOOT_HEADER_MAGIC 0x1badb002 39 #define MULTIBOOT_HEADER_FLAGS 0x00010003 40 41 #define MULTIBOOT_LOADER_MAGIC 0x2badb002 42 43 #ifndef __ASM__ 44 38 45 #include <typedefs.h> 39 46 #include <arch/boot/memmap.h> 47 48 /** Convert 32-bit multiboot address to a pointer. */ 49 #define MULTIBOOT_PTR(mba) ((void *) (uintptr_t) (mba)) 40 50 41 51 /** Multiboot 32-bit address. */ 42 52 typedef uint32_t mbaddr_t; 43 53 44 /** Multiboot mod structure */54 /** Multiboot module structure */ 45 55 typedef struct { 46 56 mbaddr_t start; … … 48 58 mbaddr_t string; 49 59 uint32_t reserved; 50 } __attribute__ ((packed)) multiboot_mod_t;60 } __attribute__((packed)) multiboot_module_t; 51 61 52 62 /** Multiboot mmap structure */ … … 54 64 uint32_t size; 55 65 e820memmap_t mm_info; 56 } __attribute__ ((packed)) multiboot_mmap_t;66 } __attribute__((packed)) multiboot_memmap_t; 57 67 58 68 /** Multiboot information structure */ … … 74 84 75 85 /* ... */ 76 } __attribute__ 86 } __attribute__((packed)) multiboot_info_t; 77 87 78 88 enum multiboot_info_flags { 79 M BINFO_FLAGS_MEM = 0x01,80 M BINFO_FLAGS_BOOT = 0x02,81 M BINFO_FLAGS_CMDLINE = 0x04,82 M BINFO_FLAGS_MODS = 0x08,83 M BINFO_FLAGS_SYMS1 = 0x10,84 M BINFO_FLAGS_SYMS2 = 0x20,85 M BINFO_FLAGS_MMAP = 0x4089 MULTIBOOT_INFO_FLAGS_MEM = 0x01, 90 MULTIBOOT_INFO_FLAGS_BOOT = 0x02, 91 MULTIBOOT_INFO_FLAGS_CMDLINE = 0x04, 92 MULTIBOOT_INFO_FLAGS_MODS = 0x08, 93 MULTIBOOT_INFO_FLAGS_SYMS1 = 0x10, 94 MULTIBOOT_INFO_FLAGS_SYMS2 = 0x20, 95 MULTIBOOT_INFO_FLAGS_MMAP = 0x40 86 96 87 97 /* ... */ 88 98 }; 89 99 90 #define MULTIBOOT_LOADER_MAGIC 0x2BADB002 100 extern void multiboot_extract_command(char *, size_t, const char *); 101 extern void multiboot_info_parse(uint32_t, const multiboot_info_t *); 91 102 92 /** Convert 32-bit multiboot address to a pointer. */ 93 #define MULTIBOOT_PTR(mba) ((void *)(uintptr_t) (mba)) 94 95 extern void multiboot_info_parse(uint32_t, const multiboot_info_t *); 103 #endif /* __ASM__ */ 96 104 97 105 #endif
Note:
See TracChangeset
for help on using the changeset viewer.