Changeset 7aaed09 in mainline for kernel/genarch/include/multiboot/multiboot.h

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/genarch/include/multiboot/multiboot.h

@@ -36 +36 @@
 #define KERN_MULTIBOOT_H_
 
+#define MULTIBOOT_HEADER_MAGIC  0x1badb002
+#define MULTIBOOT_HEADER_FLAGS  0x00010003
+
+#define MULTIBOOT_LOADER_MAGIC  0x2badb002
+
+#ifndef __ASM__
+
 #include <typedefs.h>
 #include <arch/boot/memmap.h>
+
+/** Convert 32-bit multiboot address to a pointer. */
+#define MULTIBOOT_PTR(mba)  ((void *) (uintptr_t) (mba))
 
 /** Multiboot 32-bit address. */
 typedef uint32_t mbaddr_t;
 
-/** Multiboot mod structure */
+/** Multiboot module structure */
 typedef struct {
         mbaddr_t start;
@@ -48 +58 @@
         mbaddr_t string;
         uint32_t reserved;
-} __attribute__ ((packed)) multiboot_mod_t;
+} __attribute__((packed)) multiboot_module_t;
 
 /** Multiboot mmap structure */
@@ -54 +64 @@
         uint32_t size;
         e820memmap_t mm_info;
-} __attribute__ ((packed)) multiboot_mmap_t;
+} __attribute__((packed)) multiboot_memmap_t;
 
 /** Multiboot information structure */
@@ -74 +84 @@
         
         /* ... */
-} __attribute__ ((packed)) multiboot_info_t;
+} __attribute__((packed)) multiboot_info_t;
 
 enum multiboot_info_flags {
-        MBINFO_FLAGS_MEM     = 0x01,
-        MBINFO_FLAGS_BOOT    = 0x02,
-        MBINFO_FLAGS_CMDLINE = 0x04,
-        MBINFO_FLAGS_MODS    = 0x08,
-        MBINFO_FLAGS_SYMS1   = 0x10,
-        MBINFO_FLAGS_SYMS2   = 0x20,
-        MBINFO_FLAGS_MMAP    = 0x40
+        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
         
         /* ... */
 };
 
-#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
+extern void multiboot_extract_command(char *, size_t, const char *);
+extern void multiboot_info_parse(uint32_t, const multiboot_info_t *);
 
-/** Convert 32-bit multiboot address to a pointer. */
-#define MULTIBOOT_PTR(mba) ((void *)(uintptr_t) (mba))
-
-extern void multiboot_info_parse(uint32_t, const multiboot_info_t *);
+#endif /* __ASM__ */
 
 #endif