Changeset 965dc18 in mainline for kernel/arch/ppc32/src/ppc32.c

Timestamp:

2008-12-05T19:59:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

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

kernel/arch/ppc32/src/ppc32.c

@@ -95 +95 @@
                         panic("Unsupported bits per pixel");
                 }
-                fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.scanline, visual);
+                fb_properties_t prop = {
+                        .addr = bootinfo.screen.addr,
+                        .offset = 0,
+                        .x = bootinfo.screen.width,
+                        .y = bootinfo.screen.height,
+                        .scan = bootinfo.screen.scanline,
+                        .visual = visual,
+                };
+                fb_init(&prop);
                 
                 /* Initialize IRQ routing */
@@ -104 +112 @@
                 
                 /* Initialize I/O controller */
-                cuda_init(device_assign_devno(), bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE);
+                cuda_init(device_assign_devno(),
+                    bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE);
                 
                 /* Merge all zones to 1 big zone */
@@ -129 +138 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        userspace_asm((uintptr_t) kernel_uarg->uspace_uarg, (uintptr_t) kernel_uarg->uspace_stack + THREAD_STACK_SIZE - SP_DELTA, (uintptr_t) kernel_uarg->uspace_entry);
+        userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
+            (uintptr_t) kernel_uarg->uspace_stack +
+            THREAD_STACK_SIZE - SP_DELTA,
+            (uintptr_t) kernel_uarg->uspace_entry);
         
         /* Unreachable */