Changeset 5d8d71e in mainline for kernel/arch/ia32/include

Timestamp:

2009-03-03T21:17:45Z (17 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.

Location:

kernel/arch/ia32/include

Files:

• arch.h (modified) (2 diffs)
• boot/boot.h (modified) (1 diff)

kernel/arch/ia32/include/arch.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2009 Martin Decky
  * All rights reserved.
  *
@@ -36 +36 @@
 #define KERN_ia32_ARCH_H_
 
-#include <arch/boot/multiboot.h>
+#include <genarch/multiboot/multiboot.h>
 
-extern void arch_pre_main(uint32_t signature, const mb_info_t *mi);
+extern void arch_pre_main(uint32_t, const multiboot_info_t *);
 
 #endif

kernel/arch/ia32/include/boot/boot.h

@@ -43 +43 @@
 #define MULTIBOOT_HEADER_FLAGS  0x00010003
 
-#define MULTIBOOT_LOADER_MAGIC  0x2BADB002
-
 #ifndef __ASM__
 
 #ifdef CONFIG_SMP
 
+/* This is only a symbol so the type is dummy. Obtain the value using &. */
 extern int _hardcoded_unmapped_size;