Changeset 1f5c9c96 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2011-12-02T17:29:43Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b8b1e631, c3887ad

Parents:

c48f6ab

Message:

implement multiboot v2 specification and use it in GRUB for UEFI

• improve multiboot v1 code, move defines to a common location
• rename VESA framebuffer stuff to generic "boot framebuffer"
• small collateral changes

File:

• kernel/arch/amd64/src/amd64.c (modified) (3 diffs)

kernel/arch/amd64/src/amd64.c

@@ -41 +41 @@
 #include <proc/thread.h>
 #include <genarch/multiboot/multiboot.h>
+#include <genarch/multiboot/multiboot2.h>
 #include <genarch/drivers/legacy/ia32/io.h>
 #include <genarch/drivers/ega/ega.h>
-#include <arch/drivers/vesa.h>
+#include <genarch/fb/bfb.h>
 #include <genarch/drivers/i8042/i8042.h>
 #include <genarch/kbrd/kbrd.h>
@@ -101 +102 @@
 /** Perform amd64-specific initialization before main_bsp() is called.
  *
- * @param signature Should contain the multiboot signature.
- * @param mi        Pointer to the multiboot information structure.
- */
-void arch_pre_main(uint32_t signature, const multiboot_info_t *mi)
+ * @param signature Multiboot signature.
+ * @param info      Multiboot information structure.
+ *
+ */
+void arch_pre_main(uint32_t signature, void *info)
 {
         /* Parse multiboot information obtained from the bootloader. */
-        multiboot_info_parse(signature, mi);
+        multiboot_info_parse(signature, (multiboot_info_t *) info);
+        multiboot2_info_parse(signature, (multiboot2_info_t *) info);
         
 #ifdef CONFIG_SMP
@@ -153 +156 @@
                 
 #if (defined(CONFIG_FB) || defined(CONFIG_EGA))
-                bool vesa = false;
+                bool bfb = false;
 #endif
                 
 #ifdef CONFIG_FB
-                vesa = vesa_init();
+                bfb = bfb_init();
 #endif
                 
 #ifdef CONFIG_EGA
-                if (!vesa) {
+                if (!bfb) {
                         outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM);
                         if (egadev)