Changeset 5d8d71e in mainline for kernel/genarch/include/multiboot/multiboot.h

Timestamp:

2009-03-03T21:17:45Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

06f96234

Parents:

c22e964

Message:

Move multiboot parsing to genarch/*/multiboot and adapt it for use with both ia32 and amd64. Multiboot info parsing now supported on amd64, too.

File:

• kernel/genarch/include/multiboot/multiboot.h (moved) (moved from kernel/arch/ia32/include/boot/multiboot.h ) (5 diffs)

kernel/genarch/include/multiboot/multiboot.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2009 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ia32
+/** @addtogroup genarch
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_ia32_MULTIBOOT_H__
-#define KERN_ia32_MULTIBOOT_H_
+#ifndef KERN_MULTIBOOT_H_
+#define KERN_MULTIBOOT_H_
 
 #include <arch/types.h>
 #include <arch/boot/memmap.h>
 
+/** Multiboot 32-bit address. */
+typedef uint32_t mbaddr_t;
+
 /** Multiboot mod structure */
 typedef struct {
-        uintptr_t start;
-        uintptr_t end;
-        char *string;
+        mbaddr_t start;
+        mbaddr_t end;
+        mbaddr_t string;
         uint32_t reserved;
-} __attribute__ ((packed)) mb_mod_t;
+} __attribute__ ((packed)) multiboot_mod_t;
 
 /** Multiboot mmap structure */
@@ -51 +54 @@
         uint32_t size;
         e820memmap_t mm_info;
-} __attribute__ ((packed)) mb_mmap_t;
+} __attribute__ ((packed)) multiboot_mmap_t;
 
 /** Multiboot information structure */
 typedef struct {
         uint32_t flags;
-        uintptr_t mem_lower;
-        uintptr_t mem_upper;
+        uint32_t mem_lower;
+        uint32_t mem_upper;
         
         uint32_t boot_device;
-        char *cmdline;
+        uint32_t cmdline;
         
         uint32_t mods_count;
-        mb_mod_t *mods_addr;
+        mbaddr_t mods_addr;
         
         uint32_t syms[4];
         
         uint32_t mmap_length;
-        mb_mmap_t *mmap_addr;
+        mbaddr_t mmap_addr;
         
         /* ... */
-} __attribute__ ((packed)) mb_info_t;
+} __attribute__ ((packed)) multiboot_info_t;
 
-enum mb_info_flags {
+enum multiboot_info_flags {
         MBINFO_FLAGS_MEM     = 0x01,
         MBINFO_FLAGS_BOOT    = 0x02,
@@ -85 +88 @@
 };
 
+#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
+
+/** 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