Changeset 48c1ef9 in mainline for arch/ppc64/src/ppc64.c

Timestamp:

2006-05-21T20:38:18Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

040542aa

Parents:

bd55bbb

Message:

port ppc32 changes to ppc64 (raw)

File:

• arch/ppc64/src/ppc64.c (modified) (4 diffs)

arch/ppc64/src/ppc64.c

@@ -29 +29 @@
 #include <arch.h>
 #include <arch/boot/boot.h>
-#include <arch/console.h>
 #include <arch/mm/memory_init.h>
 #include <arch/interrupt.h>
-#include <mm/frame.h>
+#include <genarch/fb/fb.h>
+#include <userspace.h>
+#include <proc/uarg.h>
 
 bootinfo_t bootinfo;
+
+void arch_pre_main(void)
+{
+        /* Setup usermode */
+        init.cnt = bootinfo.taskmap.count;
+        
+        __u32 i;
+        
+        for (i = 0; i < bootinfo.taskmap.count; i++) {
+                init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr);
+                init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
+        }
+}
 
 void arch_pre_mm_init(void)
@@ -43 +57 @@
         /* Start decrementer */
         start_decrementer();
-
-        ppc64_console_init();
 }
 
@@ -50 +62 @@
 {
         if (config.cpu_active == 1) {
+                fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);    
+        
                 /* Merge all zones to 1 big zone */
                 zone_merge_all();
@@ -68 +82 @@
 }
 
+void userspace(uspace_arg_t *kernel_uarg)
+{
+        userspace_asm((__address) kernel_uarg->uspace_uarg, (__address) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (__address) kernel_uarg->uspace_entry);
+        
+        /* Unreachable */
+        for (;;)
+                ;
+}