Changeset 3de8b81b in mainline for boot/arch/ppc64/loader/main.c

Timestamp:

2006-07-17T00:22:27Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

41c4444

Parents:

fcf907e

Message:

sync ppc64 with ppc32

File:

• boot/arch/ppc64/loader/main.c (modified) (3 diffs)

boot/arch/ppc64/loader/main.c

@@ -32 +32 @@
 #include "_components.h"
 #include <ofw.h>
+#include <align.h>
 
 #define HEAP_GAP 1024000
@@ -102 +103 @@
         }
         
+        if (!ofw_keyboard(&bootinfo.keyboard)) {
+                printf("Error: unable to get keyboard properties, halting.\n");
+                halt();
+        }
+        
         printf("\nDevice statistics\n");
         printf(" screen at %L, resolution %dx%d, %d bpp (scanline %d bytes)\n", bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
+        printf(" keyboard at %L (size %d bytes)\n", bootinfo.keyboard.addr, bootinfo.keyboard.size);
         
         void *real_mode_pa = ofw_translate(&real_mode);
@@ -152 +159 @@
         
         printf("\nBooting the kernel...\n");
-        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa);
+        jump_to_kernel(bootinfo_pa, sizeof(bootinfo), trans_pa, pages << PAGE_WIDTH, real_mode_pa, (void *) bootinfo.screen.addr, bootinfo.screen.scanline);
 }