Changes in / [bc7d44c:207e208e] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• boot/arch/arm32/loader/asm.h (modified) (1 diff)
• boot/arch/arm32/loader/main.c (modified) (1 diff)
• boot/arch/ia64/loader/asm.h (modified) (1 diff)
• boot/arch/ia64/loader/main.h (modified) (1 diff)
• boot/arch/mips32/loader/asm.h (modified) (1 diff)
• boot/arch/mips32/loader/main.c (modified) (1 diff)
• boot/arch/ppc32/loader/Makefile (modified) (3 diffs)
• boot/arch/ppc32/loader/_link.ld.in (modified) (1 diff)
• boot/arch/ppc32/loader/asm.S (modified) (9 diffs)
• boot/arch/ppc32/loader/asm.h (modified) (1 diff)
• boot/arch/ppc32/loader/main.c (modified) (7 diffs)
• boot/arch/ppc32/loader/main.h (modified) (3 diffs)
• boot/arch/ppc32/loader/ofwarch.c (modified) (2 diffs)
• boot/arch/ppc32/loader/ofwarch.h (modified) (1 diff)
• boot/arch/ppc32/loader/regname.h (modified) (1 diff)
• boot/arch/sparc64/loader/asm.S (modified) (4 diffs)
• boot/arch/sparc64/loader/asm.h (modified) (1 diff)
• boot/arch/sparc64/loader/boot.S (modified) (5 diffs)
• boot/arch/sparc64/loader/main.c (modified) (17 diffs)
• boot/arch/sparc64/loader/main.h (modified) (2 diffs)
• boot/arch/sparc64/loader/ofwarch.c (modified) (7 diffs)
• boot/arch/sparc64/loader/ofwarch.h (modified) (1 diff)
• boot/arch/sparc64/loader/register.h (modified) (1 diff)
• boot/arch/sparc64/loader/stack.h (modified) (1 diff)
• boot/genarch/balloc.c (modified) (2 diffs)
• boot/genarch/balloc.h (modified) (2 diffs)
• boot/genarch/ofw.c (modified) (8 diffs)
• boot/genarch/ofw.h (modified) (4 diffs)
• boot/genarch/ofw_tree.c (modified) (10 diffs)
• boot/genarch/ofw_tree.h (modified) (1 diff)
• boot/generic/memstr.h (deleted)
• boot/generic/printf.c (modified) (1 diff)
• boot/generic/printf.h (modified) (1 diff)
• boot/generic/stdarg.h (modified) (1 diff)
• kernel/arch/ia64/src/drivers/ski.c (modified) (1 diff)
• kernel/arch/ppc32/include/asm/regname.h (modified) (2 diffs)
• kernel/arch/ppc32/include/boot/boot.h (modified) (2 diffs)
• kernel/arch/ppc32/src/mm/tlb.c (modified) (2 diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (6 diffs)
• kernel/arch/sparc64/include/drivers/fhc.h (modified) (1 diff)
• kernel/arch/sparc64/src/drivers/fhc.c (modified) (1 diff)
• kernel/arch/sparc64/src/drivers/kbd.c (modified) (2 diffs)
• kernel/arch/sparc64/src/drivers/pci.c (modified) (1 diff)
• kernel/arch/sparc64/src/drivers/scr.c (modified) (1 diff)
• kernel/arch/sparc64/src/drivers/sgcn.c (modified) (1 diff)
• kernel/genarch/Makefile.inc (modified) (1 diff)
• kernel/genarch/include/fb/fb.h (modified) (1 diff)
• kernel/genarch/include/fb/visuals.h (modified) (1 diff)
• kernel/genarch/include/ofw/ebus.h (deleted)
• kernel/genarch/include/ofw/fhc.h (deleted)
• kernel/genarch/include/ofw/ofw_tree.h (modified) (2 diffs)
• kernel/genarch/include/ofw/pci.h (deleted)
• kernel/genarch/include/ofw/sbus.h (deleted)
• kernel/genarch/include/ofw/upa.h (deleted)
• kernel/genarch/src/drivers/dsrln/dsrlnout.c (modified) (1 diff)
• kernel/genarch/src/drivers/ega/ega.c (modified) (1 diff)
• kernel/genarch/src/fb/fb.c (modified) (4 diffs)
• kernel/genarch/src/ofw/ebus.c (modified) (1 diff)
• kernel/genarch/src/ofw/fhc.c (modified) (1 diff)
• kernel/genarch/src/ofw/ofw_tree.c (modified) (13 diffs)
• kernel/genarch/src/ofw/pci.c (modified) (1 diff)
• kernel/genarch/src/ofw/sbus.c (modified) (1 diff)
• kernel/genarch/src/ofw/upa.c (modified) (1 diff)
• kernel/generic/include/console/chardev.h (modified) (3 diffs)
• kernel/generic/include/console/console.h (modified) (1 diff)
• kernel/generic/src/console/chardev.c (modified) (2 diffs)
• kernel/generic/src/console/console.c (modified) (2 diffs)

HelenOS.config

@@ -273 +273 @@
 
 % OpenFirmware tree support
-! [PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_OFW_TREE (y)
-
-% OpenFirmware PCI bus support
-! [PLATFORM=sparc64] CONFIG_OFW_PCI (y)
+! [PLATFORM=sparc64] CONFIG_OFW_TREE (y)
 
 % Multiboot standard support

boot/arch/arm32/loader/asm.h

@@ -40 +40 @@
 
 
+/** Copies cnt bytes from dst to src.
+ *
+ * @param dst Destination address.
+ * @param src Source address.
+ * @param cnt Count of bytes to be copied.
+ */
+#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt))
+
+
 /** Called when the CPU is switched on.
  *

boot/arch/arm32/loader/main.c

@@ -43 +43 @@
 #include <macros.h>
 #include <string.h>
-#include <memstr.h>
 
 #include "mm.h"

boot/arch/ia64/loader/asm.h

@@ -34 +34 @@
 #include "main.h"
 
-#define PAGE_WIDTH  14
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_WIDTH      14
+#define PAGE_SIZE       (1 << PAGE_WIDTH)
 
-#define BALLOC_MAX_SIZE  (128 * 1024)
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
 extern void halt(void);
+/*extern void jump_to_kernel(void *entry, uint64_t cfg, bootinfo_t *bootinfo,
+        unsigned int bootinfo_size) __attribute__((noreturn));*/
+
 extern void jump_to_kernel(void *) __attribute__((noreturn));
 

boot/arch/ia64/loader/main.h

@@ -34 +34 @@
 
 
-#define CONFIG_INIT_TASKS  32
+#define CONFIG_INIT_TASKS       32
+
+
 
 extern void start(void);

boot/arch/mips32/loader/asm.h

@@ -33 +33 @@
 #define PAGE_WIDTH  14
 
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+
 void jump_to_kernel(void *entry, void *bootinfo) __attribute__((noreturn));
 

boot/arch/mips32/loader/main.c

@@ -27 +27 @@
  */
 
-#include "main.h"
+#include "main.h" 
 #include <printf.h>
 #include <align.h>
 #include <macros.h>
 #include <string.h>
-#include <memstr.h>
 #include "msim.h"
 #include "asm.h"

boot/arch/ppc32/loader/Makefile

@@ -62 +62 @@
 SOURCES = \
         main.c \
+        ofwarch.c \
         _components.c \
+        ../../../genarch/ofw.c \
         ../../../generic/printf.c \
         ../../../generic/string.c \
-        ../../../genarch/balloc.c \
-        ../../../genarch/ofw.c \
-        ../../../genarch/ofw_tree.c \
-        ofwarch.c \
         asm.S \
         boot.S
@@ -75 +73 @@
         $(KERNELDIR)/kernel.bin \
         $(USPACEDIR)/srv/ns/ns \
+        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/bd/rd/rd \
@@ -101 +99 @@
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/trace/trace \
-        $(USPACEDIR)/app/bdsh/bdsh \
-        $(USPACEDIR)/app/klog/klog
+        $(USPACEDIR)/app/klog/klog \
+        $(USPACEDIR)/app/bdsh/bdsh
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

boot/arch/ppc32/loader/_link.ld.in

@@ -19 +19 @@
 [[COMPONENTS]]
         }
-        
-        /DISCARD/ : {
-                *(.comment);
-                *(.note*);
-        }
 }

boot/arch/ppc32/loader/asm.S

@@ -29 +29 @@
 #include "asm.h"
 #include "regname.h"
-#include "ofwarch.h"
 
 .macro SMC_COHERENCY addr
@@ -46 +45 @@
 
 .macro TLB_FLUSH reg
-        li \reg, 0
-        sync
-        
-        .rept 64
-                tlbie \reg
-                addi \reg, \reg, 0x1000
-        .endr
-        
-        eieio
-        tlbsync
-        sync
+        tlbie \reg
+        addi \reg, \reg, 0x1000
 .endm
 
@@ -64 +54 @@
 .global memcpy
 .global jump_to_kernel
-.global balloc_base
 
 halt:
@@ -73 +62 @@
         addi r6, r3, -4
         addi r4, r4, -4
-        beq 2f
+        beq     2f
         
         andi. r0, r6, 3
@@ -80 +69 @@
         
         1:
-                lwz r7, 4(r4)
-                lwzu r8, 8(r4)
-                stw r7, 4(r6)
-                stwu r8, 8(r6)
-                bdnz 1b
-                
-                andi. r5, r5, 7
+        
+        lwz r7, 4(r4)
+        lwzu r8, 8(r4)
+        stw r7, 4(r6)
+        stwu r8, 8(r6)
+        bdnz 1b
+        
+        andi. r5, r5, 7
         
         2:
-                cmplwi 0, r5, 4
-                blt 3f
-                
-                lwzu r0, 4(r4)
-                addi r5, r5, -4
-                stwu r0, 4(r6)
+        
+        cmplwi 0, r5, 4
+        blt 3f
+        
+        lwzu r0, 4(r4)
+        addi r5, r5, -4
+        stwu r0, 4(r6)
         
         3:
-                cmpwi 0, r5, 0
-                beqlr
-                mtctr r5
-                addi r4, r4, 3
-                addi r6, r6, 3
+        
+        cmpwi 0, r5, 0
+        beqlr
+        mtctr r5
+        addi r4, r4, 3
+        addi r6, r6, 3
         
         4:
-                lbzu r0, 1(r4)
-                stbu r0, 1(r6)
-                bdnz 4b
-                blr
+        
+        lbzu r0, 1(r4)
+        stbu r0, 1(r6)
+        bdnz 4b
+        blr
         
         5:
-                subfic r0, r0, 4
-                mtctr r0
+        
+        subfic r0, r0, 4
+        mtctr r0
         
         6:
-                lbz r7, 4(r4)
-                addi r4, r4, 1
-                stb r7, 4(r6)
-                addi r6, r6, 1
-                bdnz 6b
-                subf r5, r0, r5
-                rlwinm. r7, r5, 32-3, 3, 31
-                beq 2b
-                mtctr r7
-                b 1b
+        
+        lbz r7, 4(r4)
+        addi r4, r4, 1
+        stb r7, 4(r6)
+        addi r6, r6, 1
+        bdnz 6b
+        subf r5, r0, r5
+        rlwinm. r7, r5, 32-3, 3, 31
+        beq 2b
+        mtctr r7
+        b 1b
+
 
 jump_to_kernel:
@@ -132 +128 @@
         # r6 = bytes to copy
         # r7 = real_mode (pa)
+        # r8 = framebuffer (pa)
+        # r9 = scanline
         
         # disable interrupts
@@ -155 +153 @@
         rfi
 
-.align PAGE_WIDTH
-balloc_base:
-        .fill BALLOC_MAX_SIZE
-
 .section REALMODE, "ax"
-
 .align PAGE_WIDTH
 .global real_mode
+
 real_mode:
         
         # copy kernel to proper location
         #
-        # r3 = bootinfo (pa)
-        # r4 = bootinfo_size
         # r5 = trans (pa)
         # r6 = bytes to copy
+        # r8 = framebuffer (pa)
+        # r9 = scanline
         
         li r31, PAGE_SIZE >> 2
@@ -349 +343 @@
         # flush TLB
         
-        TLB_FLUSH r31
+        li r31, 0
+        sync
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        TLB_FLUSH r31
+        
+        eieio
+        tlbsync
+        sync
         
         # start the kernel
         #
-        # pc = PA2KA(BOOT_OFFSET)
+        # pc = KERNEL_START_ADDR
         # r3 = bootinfo (pa)
-        # sprg0 = BOOT_OFFSET
+        # sprg0 = KA2PA(KERNEL_START_ADDR)
         # sprg3 = physical memory size
         # sp = 0 (pa)
         
-        lis r31, PA2KA(BOOT_OFFSET)@ha
-        addi r31, r31, PA2KA(BOOT_OFFSET)@l
+        lis r31, KERNEL_START_ADDR@ha
+        addi r31, r31, KERNEL_START_ADDR@l
+        
         mtspr srr0, r31
         
-        lis r31, BOOT_OFFSET@ha
-        addi r31, r31, BOOT_OFFSET@l
+        subis r31, r31, 0x8000
         mtsprg0 r31
         
@@ -383 +454 @@
 .global trans
 trans:
-        .rept TRANS_SIZE
-        .int 0
-        .endr
+        .space (TRANS_SIZE * TRANS_ITEM_SIZE)

boot/arch/ppc32/loader/asm.h

@@ -30 +30 @@
 #define BOOT_ppc32_ASM_H_
 
-#define PAGE_WIDTH  12
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_SIZE 4096
+#define PAGE_WIDTH 12
 
-#define TRANS_SIZE   1024
-#define BOOT_OFFSET  0x8000
+#define TRANS_SIZE 1024
+#define TRANS_ITEM_SIZE 4
 
-#define BALLOC_MAX_SIZE  (128 * 1024)
+#define KERNEL_START_ADDR 0x80008000
 
 #ifndef __ASM__
 
-#include "types.h"
-#include "main.h"
-#include "ofwarch.h"
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-#define PA2KA(x)  (((uintptr_t) (x)) + 0x80000000)
-
-extern uint8_t balloc_base[BALLOC_MAX_SIZE];
-extern uintptr_t trans[TRANS_SIZE];
+extern void *trans[TRANS_SIZE];
 
 extern void halt();
-extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size,
-    uintptr_t trans[], unsigned int kernel_size, void *real_mode) __attribute__((noreturn));
+extern void jump_to_kernel(void *bootinfo, unsigned int bootinfo_size, void *trans, unsigned int kernel_size, void *real_mode, void *fb, unsigned int scanline) __attribute__((noreturn));
 extern void real_mode();
-
-#else
-
-#define PA2KA(x)  ((x) + 0x80000000)
 
 #endif

boot/arch/ppc32/loader/main.c

@@ -27 +27 @@
  */
 
+#include "main.h" 
 #include <printf.h>
+#include "asm.h"
+#include "_components.h"
 #include <ofw.h>
 #include <align.h>
 #include <macros.h>
 #include <string.h>
-#include "main.h"
-#include "asm.h"
-#include "_components.h"
 
-static bootinfo_t bootinfo;
-static component_t components[COMPONENTS];
-static char *release = STRING(RELEASE);
+#define HEAP_GAP 1024000
+
+bootinfo_t bootinfo;
+
+
+static void check_align(const void *addr, const char *desc)
+{
+        if ((unsigned int) addr % PAGE_SIZE != 0) {
+                printf("Error: %s not on page boundary, halting.\n", desc);
+                halt();
+        }
+}
+
+
+static void fix_overlap(void *va, void **pa, const char *desc, unsigned int *top)
+{
+        if ((unsigned int) *pa + PAGE_SIZE < *top) {
+                printf("Warning: %s overlaps kernel physical area\n", desc);
+                
+                void *new_va = (void *) (ALIGN_UP((unsigned int) KERNEL_END + HEAP_GAP, PAGE_SIZE) + *top);
+                void *new_pa = (void *) (HEAP_GAP + *top);
+                *top += PAGE_SIZE;
+                
+                if (ofw_map(new_pa, new_va, PAGE_SIZE, 0) != 0) {
+                        printf("Error: Unable to map page aligned memory at %L (physical %L), halting.\n", new_va, new_pa);
+                        halt();
+                }
+                
+                if ((unsigned int) new_pa + PAGE_SIZE < KERNEL_SIZE) {
+                        printf("Error: %s cannot be relocated, halting.\n", desc);
+                        halt(); 
+                }
+                
+                printf("Relocating %L -> %L (physical %L -> %L)\n", va, new_va, *pa, new_pa);
+                *pa = new_pa;
+                memcpy(new_va, va, PAGE_SIZE);
+        }
+}
+
+char *release = STRING(RELEASE);
 
 #ifdef REVISION
-        static char *revision = ", revision " STRING(REVISION);
+        char *revision = ", revision " STRING(REVISION);
 #else
-        static char *revision = "";
+        char *revision = "";
 #endif
 
 #ifdef TIMESTAMP
-        static char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
-        static char *timestamp = "";
+        char *timestamp = "";
 #endif
 
@@ -55 +92 @@
 static void version_print(void)
 {
-        printf("HelenOS PPC32 Bootloader\nRelease %s%s%s\n"
-            "Copyright (c) 2006 HelenOS project\n\n",
-            release, revision, timestamp);
-}
-
-static void check_align(const void *addr, const char *desc)
-{
-        if ((uintptr_t) addr % PAGE_SIZE != 0) {
-                printf("Error: %s not on page boundary, halting.\n", desc);
-                halt();
-        }
-}
-
-static void check_overlap(const void *pa, const char *desc, const uintptr_t top)
-{
-        if ((uintptr_t) pa + PAGE_SIZE < top) {
-                printf("Error: %s overlaps destination physical area\n", desc);
-                halt();
-        }
+        printf("HelenOS PPC32 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n\n", release, revision, timestamp);
 }
 
@@ -79 +98 @@
 {
         version_print();
+        
+        component_t components[COMPONENTS];
         init_components(components);
+                
+        unsigned int i;
+        for (i = 0; i < COMPONENTS; i++)
+                check_align(components[i].start, components[i].name);
+        
+        check_align(&real_mode, "bootstrap trampoline");
+        check_align(&trans, "translation table");
         
         if (!ofw_memmap(&bootinfo.memmap)) {
@@ -91 +119 @@
         }
         
-        check_align(&real_mode, "bootstrap trampoline");
-        check_align(trans, "translation table");
-        check_align(balloc_base, "boot allocations");
+        if (!ofw_screen(&bootinfo.screen))
+                printf("Warning: Unable to get screen properties.\n");
         
-        unsigned int i;
-        for (i = 0; i < COMPONENTS; i++)
-                check_align(components[i].start, components[i].name);
+        if (!ofw_macio(&bootinfo.macio))
+                printf("Warning: Unable to get macio properties.\n");
         
+        printf("Device statistics\n");
+        
+        if (bootinfo.screen.addr)
+                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);
+        
+        if (bootinfo.macio.addr)
+                printf(" macio at %L (size %d bytes)\n", bootinfo.macio.addr, bootinfo.macio.size);
+        
+        void *real_mode_pa = ofw_translate(&real_mode);
+        void *trans_pa = ofw_translate(&trans);
         void *bootinfo_pa = ofw_translate(&bootinfo);
-        void *real_mode_pa = ofw_translate(&real_mode);
-        void *trans_pa = ofw_translate(trans);
-        void *balloc_base_pa = ofw_translate(balloc_base);
         
-        printf("Memory statistics (total %d MB)\n", bootinfo.memmap.total >> 20);
+        printf("\nMemory statistics (total %d MB)\n", bootinfo.memmap.total >> 20);
         printf(" %L: boot info structure (physical %L)\n", &bootinfo, bootinfo_pa);
         printf(" %L: bootstrap trampoline (physical %L)\n", &real_mode, real_mode_pa);
-        printf(" %L: translation table (physical %L)\n", trans, trans_pa);
-        printf(" %L: boot allocations (physical %L)\n", balloc_base, balloc_base_pa);
+        printf(" %L: translation table (physical %L)\n", &trans, trans_pa);
         for (i = 0; i < COMPONENTS; i++)
                 printf(" %L: %s image (size %d bytes)\n", components[i].start, components[i].name, components[i].size);
         
-        uintptr_t top = 0;
+        unsigned int top = 0;
         for (i = 0; i < COMPONENTS; i++)
                 top += ALIGN_UP(components[i].size, PAGE_SIZE);
-        top += ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE);
-        
-        if (top >= TRANS_SIZE * PAGE_SIZE) {
-                printf("Error: boot image is too large\n");
-                halt();
-        }
-        
-        check_overlap(bootinfo_pa, "boot info", top);
-        check_overlap(real_mode_pa, "bootstrap trampoline", top);
-        check_overlap(trans_pa, "translation table", top);
         
         unsigned int pages = ALIGN_UP(KERNEL_SIZE, PAGE_SIZE) >> PAGE_WIDTH;
@@ -130 +152 @@
         for (i = 0; i < pages; i++) {
                 void *pa = ofw_translate(KERNEL_START + (i << PAGE_WIDTH));
-                check_overlap(pa, "kernel", top);
-                trans[i] = (uintptr_t) pa;
+                fix_overlap(KERNEL_START + (i << PAGE_WIDTH), &pa, "kernel", &top);
+                trans[i] = pa;
         }
         
         bootinfo.taskmap.count = 0;
         for (i = 1; i < COMPONENTS; i++) {
-                if (bootinfo.taskmap.count == TASKMAP_MAX_RECORDS) {
-                        printf("\nSkipping superfluous components.\n");
-                        break;
-                }
-                
                 unsigned int component_pages = ALIGN_UP(components[i].size, PAGE_SIZE) >> PAGE_WIDTH;
                 unsigned int j;
@@ -146 +163 @@
                 for (j = 0; j < component_pages; j++) {
                         void *pa = ofw_translate(components[i].start + (j << PAGE_WIDTH));
-                        check_overlap(pa, components[i].name, top);
-                        trans[pages + j] = (uintptr_t) pa;
+                        fix_overlap(components[i].start + (j << PAGE_WIDTH), &pa, components[i].name, &top);
+                        trans[pages + j] = pa;
                         if (j == 0) {
-                                
-                                bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = (void *) PA2KA(pages << PAGE_WIDTH);
+                                bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = (void *) (pages << PAGE_WIDTH);
                                 bootinfo.taskmap.tasks[bootinfo.taskmap.count].size = components[i].size;
                                 strncpy(bootinfo.taskmap.tasks[bootinfo.taskmap.count].name,
                                     components[i].name, BOOTINFO_TASK_NAME_BUFLEN);
-                                
+
                                 bootinfo.taskmap.count++;
                         }
@@ -162 +178 @@
         }
         
-        uintptr_t balloc_kernel_base = PA2KA(pages << PAGE_WIDTH);
-        unsigned int balloc_pages = ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE) >> PAGE_WIDTH;
-        for (i = 0; i < balloc_pages; i++) {
-                void *pa = ofw_translate(balloc_base + (i << PAGE_WIDTH));
-                check_overlap(pa, "boot allocations", top);
-                trans[pages + i] = (uintptr_t) pa;
-        }
-        
-        pages += balloc_pages;
-        
-        balloc_init(&bootinfo.ballocs, (uintptr_t) balloc_base, balloc_kernel_base);
-        printf("\nCanonizing OpenFirmware device tree...");
-        bootinfo.ofw_root = ofw_tree_build();
-        printf("done.\n");
+        fix_overlap(&real_mode, &real_mode_pa, "bootstrap trampoline", &top);
+        fix_overlap(&trans, &trans_pa, "translation table", &top);
+        fix_overlap(&bootinfo, &bootinfo_pa, "boot info", &top);
         
         ofw_setup_palette();
         
         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);
 }

boot/arch/ppc32/loader/main.h

@@ -30 +30 @@
 #define BOOT_ppc32_MAIN_H_
 
-#include <ofw.h>
-#include <ofw_tree.h>
-#include <balloc.h>
-#include <types.h>
+#include "ofw.h"
 
-#define TASKMAP_MAX_RECORDS  32
+#define TASKMAP_MAX_RECORDS 32
 
 /** Size of buffer for storing task name in task_t. */
-#define BOOTINFO_TASK_NAME_BUFLEN  32
+#define BOOTINFO_TASK_NAME_BUFLEN 32
 
+/** Struct holding information about single loaded task. */
 typedef struct {
+        /** Address where the task was placed. */
         void *addr;
-        uint32_t size;
+        /** Size of the task's binary. */
+        unsigned int size;
+        /** Task name. */
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } task_t;
 
 typedef struct {
-        uint32_t count;
+        unsigned int count;
         task_t tasks[TASKMAP_MAX_RECORDS];
 } taskmap_t;
@@ -54 +55 @@
         memmap_t memmap;
         taskmap_t taskmap;
-        ballocs_t ballocs;
-        ofw_tree_node_t *ofw_root;
+        screen_t screen;
+        macio_t macio;
 } bootinfo_t;
 
@@ -61 +62 @@
 extern void bootstrap(void);
 
+extern memmap_t memmap;
+
 #endif

boot/arch/ppc32/loader/ofwarch.c

@@ -31 +31 @@
 #include <printf.h>
 
-typedef int (*ofw_entry_t)(ofw_args_t *args);
+typedef int (* ofw_entry_t)(ofw_args_t *args);
 
 int ofw(ofw_args_t *args)
@@ -49 +49 @@
 }
 
+int ofw_macio(macio_t *macio)
+{
+        char device_name[BUF_SIZE];
+        
+        if ((ofw_get_property(ofw_aliases, "macio", device_name, sizeof(device_name)) <= 0)
+            && (ofw_get_property(ofw_aliases, "mac-io", device_name, sizeof(device_name)) <= 0))
+                return false;
+        
+        phandle device = ofw_find_device(device_name);
+        if (device == -1)
+                return false;
+        
+        pci_reg_t pci_reg;
+        if (ofw_get_property(device, "assigned-addresses", &pci_reg, sizeof(pci_reg)) <= 0)
+                return false;
+        
+        macio->addr = (void *) pci_reg.addr.addr_lo;
+        macio->size = pci_reg.size_lo;
+
+        return true;
+}
+
 int ofw_translate_failed(ofw_arg_t flag)
 {
-        /* PearPC returns buggy flag */
         return 0;
 }

boot/arch/ppc32/loader/ofwarch.h

@@ -30 +30 @@
 #define BOOT_ppc32_OFWARCH_H_
 
-#define OFW_ADDRESS_CELLS  1
-#define OFW_SIZE_CELLS     1
+#define OFW_ADDRESS_CELLS       1
+#define OFW_SIZE_CELLS          1
 
 #endif

boot/arch/ppc32/loader/regname.h

@@ -31 +31 @@
 
 /* Condition Register Bit Fields */
-#define cr0  0
-#define cr1  1
-#define cr2  2
-#define cr3  3
-#define cr4  4
-#define cr5  5
-#define cr6  6
-#define cr7  7
+#define cr0     0
+#define cr1     1
+#define cr2     2
+#define cr3     3
+#define cr4     4
+#define cr5     5
+#define cr6     6
+#define cr7     7
 
 /* General Purpose Registers (GPRs) */
-#define r0   0
-#define r1   1
-#define r2   2
-#define r3   3
-#define r4   4
-#define r5   5
-#define r6   6
-#define r7   7
-#define r8   8
-#define r9   9
-#define r10  10
-#define r11  11
-#define r12  12
-#define r13  13
-#define r14  14
-#define r15  15
-#define r16  16
-#define r17  17
-#define r18  18
-#define r19  19
-#define r20  20
-#define r21  21
-#define r22  22
-#define r23  23
-#define r24  24
-#define r25  25
-#define r26  26
-#define r27  27
-#define r28  28
-#define r29  29
-#define r30  30
-#define r31  31
+#define r0      0
+#define r1      1
+#define r2      2
+#define r3      3
+#define r4      4
+#define r5      5
+#define r6      6
+#define r7      7
+#define r8      8
+#define r9      9
+#define r10     10
+#define r11     11
+#define r12     12
+#define r13     13
+#define r14     14
+#define r15     15
+#define r16     16
+#define r17     17
+#define r18     18
+#define r19     19
+#define r20     20
+#define r21     21
+#define r22     22
+#define r23     23
+#define r24     24
+#define r25     25
+#define r26     26
+#define r27     27
+#define r28     28
+#define r29     29
+#define r30     30
+#define r31     31
 
 /* GPR Aliases */
-#define sp  1
+#define sp      1
 
 /* Floating Point Registers (FPRs) */
-#define fr0   0
-#define fr1   1
-#define fr2   2
-#define fr3   3
-#define fr4   4
-#define fr5   5
-#define fr6   6
-#define fr7   7
-#define fr8   8
-#define fr9   9
-#define fr10  10
-#define fr11  11
-#define fr12  12
-#define fr13  13
-#define fr14  14
-#define fr15  15
-#define fr16  16
-#define fr17  17
-#define fr18  18
-#define fr19  19
-#define fr20  20
-#define fr21  21
-#define fr22  22
-#define fr23  23
-#define fr24  24
-#define fr25  25
-#define fr26  26
-#define fr27  27
-#define fr28  28
-#define fr29  29
-#define fr30  30
-#define fr31  31
-
-#define vr0   0
-#define vr1   1
-#define vr2   2
-#define vr3   3
-#define vr4   4
-#define vr5   5
-#define vr6   6
-#define vr7   7
-#define vr8   8
-#define vr9   9
-#define vr10  10
-#define vr11  11
-#define vr12  12
-#define vr13  13
-#define vr14  14
-#define vr15  15
-#define vr16  16
-#define vr17  17
-#define vr18  18
-#define vr19  19
-#define vr20  20
-#define vr21  21
-#define vr22  22
-#define vr23  23
-#define vr24  24
-#define vr25  25
-#define vr26  26
-#define vr27  27
-#define vr28  28
-#define vr29  29
-#define vr30  30
-#define vr31  31
-
-#define evr0   0
-#define evr1   1
-#define evr2   2
-#define evr3   3
-#define evr4   4
-#define evr5   5
-#define evr6   6
-#define evr7   7
-#define evr8   8
-#define evr9   9
-#define evr10  10
-#define evr11  11
-#define evr12  12
-#define evr13  13
-#define evr14  14
-#define evr15  15
-#define evr16  16
-#define evr17  17
-#define evr18  18
-#define evr19  19
-#define evr20  20
-#define evr21  21
-#define evr22  22
-#define evr23  23
-#define evr24  24
-#define evr25  25
-#define evr26  26
-#define evr27  27
-#define evr28  28
-#define evr29  29
-#define evr30  30
-#define evr31  31
+#define fr0             0
+#define fr1             1
+#define fr2             2
+#define fr3             3
+#define fr4             4
+#define fr5             5
+#define fr6             6
+#define fr7             7
+#define fr8             8
+#define fr9             9
+#define fr10    10
+#define fr11    11
+#define fr12    12
+#define fr13    13
+#define fr14    14
+#define fr15    15
+#define fr16    16
+#define fr17    17
+#define fr18    18
+#define fr19    19
+#define fr20    20
+#define fr21    21
+#define fr22    22
+#define fr23    23
+#define fr24    24
+#define fr25    25
+#define fr26    26
+#define fr27    27
+#define fr28    28
+#define fr29    29
+#define fr30    30
+#define fr31    31
+
+#define vr0             0
+#define vr1             1
+#define vr2             2
+#define vr3             3
+#define vr4             4
+#define vr5             5
+#define vr6             6
+#define vr7             7
+#define vr8             8
+#define vr9             9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+
+#define evr0    0
+#define evr1    1
+#define evr2    2
+#define evr3    3
+#define evr4    4
+#define evr5    5
+#define evr6    6
+#define evr7    7
+#define evr8    8
+#define evr9    9
+#define evr10   10
+#define evr11   11
+#define evr12   12
+#define evr13   13
+#define evr14   14
+#define evr15   15
+#define evr16   16
+#define evr17   17
+#define evr18   18
+#define evr19   19
+#define evr20   20
+#define evr21   21
+#define evr22   22
+#define evr23   23
+#define evr24   24
+#define evr25   25
+#define evr26   26
+#define evr27   27
+#define evr28   28
+#define evr29   29
+#define evr30   30
+#define evr31   31
 
 /* Special Purpose Registers (SPRs) */
-#define xer      1
-#define lr       8
-#define ctr      9
-#define dec      22
-#define sdr1     25
-#define srr0     26
-#define srr1     27
-#define sprg0    272
-#define sprg1    273
-#define sprg2    274
-#define sprg3    275
-#define prv      287
-#define ibat0u   528
-#define ibat0l   529
-#define ibat1u   530
-#define ibat1l   531
-#define ibat2u   532
-#define ibat2l   533
-#define ibat3u   534
-#define ibat3l   535
-#define dbat0u   536
-#define dbat0l   537
-#define dbat1u   538
-#define dbat1l   539
-#define dbat2u   540
-#define dbat2l   541
-#define dbat3u   542
-#define dbat3l   543
-#define tlbmiss  980
-#define ptehi    981
-#define ptelo    982
-#define hid0     1008
+#define xer             1
+#define lr              8
+#define ctr             9
+#define dec             22
+#define sdr1    25
+#define srr0    26
+#define srr1    27
+#define sprg0   272
+#define sprg1   273
+#define sprg2   274
+#define sprg3   275
+#define prv             287
+#define ibat0u  528
+#define ibat0l  529
+#define ibat1u  530
+#define ibat1l  531
+#define ibat2u  532
+#define ibat2l  533
+#define ibat3u  534
+#define ibat3l  535
+#define dbat0u  536
+#define dbat0l  537
+#define dbat1u  538
+#define dbat1l  539
+#define dbat2u  540
+#define dbat2l  541
+#define dbat3u  542
+#define dbat3l  543
+#define hid0    1008
 
 /* MSR bits */
-#define msr_dr  (1 << 4)
-#define msr_ir  (1 << 5)
-#define msr_pr  (1 << 14)
-#define msr_ee  (1 << 15)
+#define msr_dr  (1 << 4)
+#define msr_ir  (1 << 5)
+#define msr_pr  (1 << 14)
+#define msr_ee  (1 << 15)
 
 /* HID0 bits */
-#define hid0_sten  (1 << 24)
-#define hid0_ice   (1 << 15)
-#define hid0_dce   (1 << 14)
-#define hid0_icfi  (1 << 11)
-#define hid0_dci   (1 << 10)
+#define hid0_sten       (1 << 24)
+#define hid0_ice        (1 << 15)
+#define hid0_dce        (1 << 14)
+#define hid0_icfi       (1 << 11)
+#define hid0_dci        (1 << 10)
 
 #endif

boot/arch/sparc64/loader/asm.S

@@ -31 +31 @@
 #include <register.h>
 
-.register %g2, #scratch
-.register %g3, #scratch
+.register       %g2, #scratch
+.register       %g3, #scratch
 
 .text
@@ -43 +43 @@
         ba %xcc, halt
         nop
+        
+memcpy:
+        mov     %o0, %o3                ! save dst
+        add     %o1, 7, %g1
+        and     %g1, -8, %g1
+        cmp     %o1, %g1
+        be,pn   %xcc, 3f
+        add     %o0, 7, %g1
+        mov     0, %g3
+0:
+        brz,pn  %o2, 2f
+        mov     0, %g2
+1:
+        ldub    [%g3 + %o1], %g1
+        add     %g2, 1, %g2
+        cmp     %o2, %g2
+        stb     %g1, [%g3 + %o0]
+        bne,pt  %xcc, 1b
+        mov     %g2, %g3
+2:
+        jmp     %o7 + 8                 ! exit point
+        mov     %o3, %o0
+3:
+        and     %g1, -8, %g1
+        cmp     %o0, %g1
+        bne,pt  %xcc, 0b
+        mov     0, %g3
+        srlx    %o2, 3, %g4
+        brz,pn  %g4, 5f
+        mov     0, %g5
+4:
+        sllx    %g3, 3, %g2
+        add     %g5, 1, %g3
+        ldx     [%o1 + %g2], %g1
+        mov     %g3, %g5
+        cmp     %g4, %g3
+        bne,pt  %xcc, 4b
+        stx     %g1, [%o0 + %g2]
+5:
+        and     %o2, 7, %o2
+        brz,pn  %o2, 2b
+        sllx    %g4, 3, %g1
+        mov     0, %g2
+        add     %g1, %o0, %o0
+        add     %g1, %o1, %g4
+        mov     0, %g3
+6:
+        ldub    [%g2 + %g4], %g1
+        stb     %g1, [%g2 + %o0]
+        add     %g3, 1, %g2
+        cmp     %o2, %g2
+        bne,pt  %xcc, 6b
+        mov     %g2, %g3
 
-memcpy:
-        mov %o0, %o3      ! save dst
-        add %o1, 7, %g1
-        and %g1, -8, %g1
-        cmp %o1, %g1
-        be,pn %xcc, 3f
-        add %o0, 7, %g1
-        mov 0, %g3
-        
-        0:
-                brz,pn %o2, 2f
-                mov 0, %g2
-        
-        1:
-                ldub [%g3 + %o1], %g1
-                add %g2, 1, %g2
-                cmp %o2, %g2
-                stb %g1, [%g3 + %o0]
-                bne,pt %xcc, 1b
-                mov %g2, %g3
-        
-        2:
-                jmp %o7 + 8   ! exit point
-                mov %o3, %o0
-        
-        3:
-                and %g1, -8, %g1
-                cmp %o0, %g1
-                bne,pt %xcc, 0b
-                mov 0, %g3
-                srlx %o2, 3, %g4
-                brz,pn %g4, 5f
-                mov 0, %g5
-        
-        4:
-                sllx %g3, 3, %g2
-                add %g5, 1, %g3
-                ldx [%o1 + %g2], %g1
-                mov %g3, %g5
-                cmp %g4, %g3
-                bne,pt %xcc, 4b
-                stx %g1, [%o0 + %g2]
-        
-        5:
-                and %o2, 7, %o2
-                brz,pn %o2, 2b
-                sllx %g4, 3, %g1
-                mov 0, %g2
-                add %g1, %o0, %o0
-                add %g1, %o1, %g4
-                mov 0, %g3
-        
-        6:
-                ldub [%g2 + %g4], %g1
-                stb %g1, [%g2 + %o0]
-                add %g3, 1, %g2
-                cmp %o2, %g2
-                bne,pt %xcc, 6b
-                mov %g2, %g3
-        
-        jmp %o7 + 8   ! exit point
-        mov %o3, %o0
+        jmp     %o7 + 8                 ! exit point
+        mov     %o3, %o0
 
 jump_to_kernel:
@@ -114 +107 @@
          * 3. Flush instruction pipeline.
          */
-        
+
         /*
          * US3 processors have a write-invalidate cache, so explicitly
          * invalidating it is not required. Whether to invalidate I-cache
-         * or not is decided according to the value of the 5th argument
-         * (subarchitecture).
+         * or not is decided according to the value of the global
+         * "subarchitecture" variable (set in the bootstrap).
          */
-        cmp %i4, 3
+        set subarchitecture, %g2
+        ldub [%g2], %g2
+        cmp %g2, 3
         be %xcc, 1f
         nop
-        
-        0:
-                call icache_flush
-                nop
-        
-        1:
-                membar #StoreStore
+0:
+        call icache_flush
+        nop
+1:
+        membar #StoreStore
         
         /*
          * Flush the instruction pipeline.
          */
-        flush %i7
-        
+        flush   %i7
+
         mov %o0, %l1
         mov %o1, %o0
         mov %o2, %o1
         mov %o3, %o2
-        jmp %l1       ! jump to kernel
+        jmp %l1                         ! jump to kernel
         nop
 
-#define ICACHE_SIZE       8192
-#define ICACHE_LINE_SIZE  32
-#define ICACHE_SET_BIT    (1 << 13)
-#define ASI_ICACHE_TAG    0x67
+#define ICACHE_SIZE             8192
+#define ICACHE_LINE_SIZE        32
+#define ICACHE_SET_BIT          (1 << 13)
+#define ASI_ICACHE_TAG          0x67
 
 # Flush I-cache
 icache_flush:
-        set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
-        stxa %g0, [%g1] ASI_ICACHE_TAG
-        
-        0:
-                membar #Sync
-                subcc %g1, ICACHE_LINE_SIZE, %g1
-                bnz,pt %xcc, 0b
-        
-        stxa %g0, [%g1] ASI_ICACHE_TAG
-        membar #Sync
+        set     ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
+        stxa    %g0, [%g1] ASI_ICACHE_TAG
+0:      membar  #Sync
+        subcc   %g1, ICACHE_LINE_SIZE, %g1
+        bnz,pt  %xcc, 0b
+        stxa    %g0, [%g1] ASI_ICACHE_TAG
+        membar  #Sync
         retl
         ! SF Erratum #51
         nop
-
 .global ofw
 ofw:
@@ -170 +159 @@
         set ofw_cif, %l0
         ldx [%l0], %l0
-        
+
         rdpr  %pstate, %l1
         and  %l1, ~PSTATE_AM_BIT, %l2
         wrpr  %l2, 0, %pstate
-        
+    
         jmpl %l0, %o7
         mov %i0, %o0
-        
+
         wrpr %l1, 0, %pstate
-        
+
         ret
         restore %o0, 0, %o0

boot/arch/sparc64/loader/asm.h

@@ -34 +34 @@
 #include "main.h"
 
-#define PAGE_WIDTH  14
-#define PAGE_SIZE   (1 << PAGE_WIDTH)
+#define PAGE_WIDTH      14
+#define PAGE_SIZE       (1 << PAGE_WIDTH)
 
-#define BALLOC_MAX_SIZE  (128 * 1024)
+#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
 extern void halt(void);
 extern void jump_to_kernel(void *entry, uint64_t cfg, bootinfo_t *bootinfo,
-    unsigned int bootinfo_size, uint8_t subarchitecture) __attribute__((noreturn));
+        unsigned int bootinfo_size) __attribute__((noreturn));
 
 #endif

boot/arch/sparc64/loader/boot.S

@@ -31 +31 @@
 #include <register.h>
 
-#define INITIAL_STACK_SIZE  8192
+#define INITIAL_STACK_SIZE      8192
 
-#define NWINDOWS  8
+#define NWINDOWS                8
 
 .register %g2, #scratch
@@ -57 +57 @@
         .half 0
         .half 0
-
 .global silo_ramdisk_image
 silo_ramdisk_image:
         .word 0
-
 .global silo_ramdisk_size
 silo_ramdisk_size:
@@ -67 +65 @@
 
 .align 8
-1:
+1:      
         /*
          * Disable interrupts and disable address masking.
@@ -73 +71 @@
         wrpr %g0, PSTATE_PRIV_BIT, %pstate
         
-        wrpr %g0, NWINDOWS - 2, %cansave   ! set maximum saveable windows
-        wrpr %g0, 0, %canrestore           ! get rid of windows we will never need again
-        wrpr %g0, 0, %otherwin             ! make sure the window state is consistent
-        wrpr %g0, NWINDOWS - 1, %cleanwin  ! prevent needless clean_window traps for kernel
-        
+        wrpr %g0, NWINDOWS - 2, %cansave        ! set maximum saveable windows
+        wrpr %g0, 0, %canrestore                ! get rid of windows we will never need again
+        wrpr %g0, 0, %otherwin                  ! make sure the window state is consistent
+        wrpr %g0, NWINDOWS - 1, %cleanwin       ! prevent needless clean_window traps for kernel
+
         set initial_stack_top, %sp
         add %sp, -STACK_BIAS, %sp
-        
+
         set ofw_cif, %l0
-        
-        call ofw_init   ! initialize OpenFirmware
+ 
+        call ofw_init           ! initialize OpenFirmware
         stx %o4, [%l0]
         
@@ -92 +90 @@
 initial_stack:
         .space INITIAL_STACK_SIZE
-
 initial_stack_top:
         .space STACK_WINDOW_SAVE_AREA_SIZE

boot/arch/sparc64/loader/main.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2006 Jakub Jermar 
  * All rights reserved.
  *
@@ -28 +28 @@
  */
 
-#include "main.h"
+#include "main.h" 
 #include <printf.h>
 #include "asm.h"
@@ -39 +39 @@
 #include <macros.h>
 #include <string.h>
-#include <memstr.h>
-
-static bootinfo_t bootinfo;
-static component_t components[COMPONENTS];
-static char *release = STRING(RELEASE);
+
+bootinfo_t bootinfo;
+
+component_t components[COMPONENTS];
+
+char *release = STRING(RELEASE);
 
 #ifdef REVISION
-        static char *revision = ", revision " STRING(REVISION);
+        char *revision = ", revision " STRING(REVISION);
 #else
-        static char *revision = "";
+        char *revision = "";
 #endif
 
 #ifdef TIMESTAMP
-        static char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
-        static char *timestamp = "";
+        char *timestamp = "";
 #endif
 
 /** UltraSPARC subarchitecture - 1 for US, 3 for US3 */
-static uint8_t subarchitecture;
+uint8_t subarchitecture;
 
 /**
@@ -64 +65 @@
  * MID_SHIFT bits to the right
  */
-static uint16_t mid_mask;
+uint16_t mid_mask;
 
 /** Print version information. */
@@ -75 +76 @@
 
 /* the lowest ID (read from the VER register) of some US3 CPU model */
-#define FIRST_US3_CPU  0x14
+#define FIRST_US3_CPU   0x14
 
 /* the greatest ID (read from the VER register) of some US3 CPU model */
-#define LAST_US3_CPU   0x19
+#define LAST_US3_CPU    0x19
 
 /* UltraSPARC IIIi processor implementation code */
-#define US_IIIi_CODE   0x15
+#define US_IIIi_CODE    0x15
 
 /**
@@ -90 +91 @@
 {
         uint64_t v;
-        asm volatile (
-                "rdpr %%ver, %0\n"
-                : "=r" (v)
-        );
+        asm volatile ("rdpr %%ver, %0\n" : "=r" (v));
         
         v = (v << 16) >> 48;
@@ -105 +103 @@
                 subarchitecture = SUBARCH_US;
                 mid_mask = (1 << 5) - 1;
-        } else
+        } else {
                 printf("\nThis CPU is not supported by HelenOS.");
+        }
 }
 
@@ -114 +113 @@
         void *balloc_base;
         unsigned int top = 0;
-        unsigned int i;
-        unsigned int j;
-        
+        int i, j;
+
         version_print();
         
         detect_subarchitecture();
         init_components(components);
-        
+
         if (!ofw_get_physmem_start(&bootinfo.physmem_start)) {
                 printf("Error: unable to get start of physical memory.\n");
                 halt();
         }
-        
+
         if (!ofw_memmap(&bootinfo.memmap)) {
                 printf("Error: unable to get memory map, halting.\n");
                 halt();
         }
-        
+
         if (bootinfo.memmap.total == 0) {
                 printf("Error: no memory detected, halting.\n");
                 halt();
         }
-        
+
         /*
          * SILO for some reason adds 0x400000 and subtracts
@@ -145 +143 @@
                 silo_ramdisk_image += bootinfo.physmem_start;
                 silo_ramdisk_image -= 0x400000;
-                
-                /* Install 1:1 mapping for the RAM disk. */
-                if (ofw_map((void *) ((uintptr_t) silo_ramdisk_image),
-                    (void *) ((uintptr_t) silo_ramdisk_image),
+                /* Install 1:1 mapping for the ramdisk. */
+                if (ofw_map((void *)((uintptr_t) silo_ramdisk_image),
+                    (void *)((uintptr_t) silo_ramdisk_image),
                     silo_ramdisk_size, -1) != 0) {
-                        printf("Failed to map RAM disk.\n");
+                        printf("Failed to map ramdisk.\n");
                         halt();
                 }
         }
         
-        printf("\nMemory statistics (total %d MB, starting at %P)\n",
+        printf("\nSystem info\n");
+        printf(" memory: %dM starting at %P\n",
             bootinfo.memmap.total >> 20, bootinfo.physmem_start);
-        printf(" %P: kernel entry point\n", KERNEL_VIRTUAL_ADDRESS);
+
+        printf("\nMemory statistics\n");
+        printf(" kernel entry point at %P\n", KERNEL_VIRTUAL_ADDRESS);
         printf(" %P: boot info structure\n", &bootinfo);
         
@@ -176 +176 @@
                                 break;
                         }
-                        
                         bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr =
                             base + top;
@@ -188 +187 @@
                 top += components[i].size;
         }
-        
-        /* Do not consider RAM disk */
-        j = bootinfo.taskmap.count - 1;
-        
+
+        j = bootinfo.taskmap.count - 1; /* do not consider ramdisk */
+
         if (silo_ramdisk_image) {
-                /* Treat the RAM disk as the last bootinfo task. */
+                /* Treat the ramdisk as the last bootinfo task. */
                 if (bootinfo.taskmap.count == TASKMAP_MAX_RECORDS) {
-                        printf("Skipping RAM disk.\n");
+                        printf("Skipping ramdisk.\n");
                         goto skip_ramdisk;
                 }
-                
                 top = ALIGN_UP(top, PAGE_SIZE);
                 bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = 
@@ -205 +202 @@
                     silo_ramdisk_size;
                 bootinfo.taskmap.count++;
-                printf("\nCopying RAM disk...");
-                
+                printf("\nCopying ramdisk...");
                 /*
                  * Claim and map the whole ramdisk as it may exceed the area
@@ -214 +210 @@
                 (void) ofw_map(bootinfo.physmem_start + base + top, base + top,
                     silo_ramdisk_size, -1);
-                memmove(base + top, (void *) ((uintptr_t) silo_ramdisk_image),
+                memmove(base + top, (void *)((uintptr_t)silo_ramdisk_image),
                     silo_ramdisk_size);
-                
                 printf("done.\n");
                 top += silo_ramdisk_size;
         }
 skip_ramdisk:
-        
+
         /*
          * Now we can proceed to copy the components. We do it in reverse order
@@ -227 +222 @@
          * with base.
          */
-        printf("\nCopying tasks...");
+        printf("\nCopying bootinfo tasks\n");
         for (i = COMPONENTS - 1; i > 0; i--, j--) {
-                printf("%s ", components[i].name);
-                
+                printf(" %s...", components[i].name);
+
                 /*
                  * At this point, we claim the physical memory that we are
@@ -245 +240 @@
                     bootinfo.taskmap.tasks[j].addr,
                     ALIGN_UP(components[i].size, PAGE_SIZE));
-                
-                memcpy((void *) bootinfo.taskmap.tasks[j].addr,
+                    
+                memcpy((void *)bootinfo.taskmap.tasks[j].addr,
                     components[i].start, components[i].size);
-                
-        }
-        printf(".\n");
-        
+                printf("done.\n");
+        }
+
         printf("\nCopying kernel...");
         (void) ofw_claim_phys(bootinfo.physmem_start + base,
@@ -257 +251 @@
         memcpy(base, components[0].start, components[0].size);
         printf("done.\n");
-        
+
         /*
          * Claim and map the physical memory for the boot allocator.
@@ -267 +261 @@
         (void) ofw_map(bootinfo.physmem_start + balloc_base, balloc_base,
             BALLOC_MAX_SIZE, -1);
-        balloc_init(&bootinfo.ballocs, (uintptr_t) balloc_base,
-            (uintptr_t) balloc_base);
-        
+        balloc_init(&bootinfo.ballocs, (uintptr_t)balloc_base);
+
         printf("\nCanonizing OpenFirmware device tree...");
         bootinfo.ofw_root = ofw_tree_build();
         printf("done.\n");
-        
+
 #ifdef CONFIG_AP
         printf("\nChecking for secondary processors...");
-        if (!ofw_cpu(mid_mask, bootinfo.physmem_start))
+        if (!ofw_cpu())
                 printf("Error: unable to get CPU properties\n");
         printf("done.\n");
 #endif
-        
+
         ofw_setup_palette();
-        
+
         printf("\nBooting the kernel...\n");
         jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,
             bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo,
-            sizeof(bootinfo), subarchitecture);
+            sizeof(bootinfo));
 }

boot/arch/sparc64/loader/main.h

@@ -35 +35 @@
 #include <types.h>
 
-#define KERNEL_VIRTUAL_ADDRESS  0x400000
+#define KERNEL_VIRTUAL_ADDRESS 0x400000
 
-#define TASKMAP_MAX_RECORDS  32
+#define TASKMAP_MAX_RECORDS 32
 
 /** Size of buffer for storing task name in task_t. */
-#define BOOTINFO_TASK_NAME_BUFLEN  32
+#define BOOTINFO_TASK_NAME_BUFLEN 32
 
-#define BSP_PROCESSOR  1
-#define AP_PROCESSOR   0
+#define BSP_PROCESSOR   1
+#define AP_PROCESSOR    0
 
-#define SUBARCH_US   1
-#define SUBARCH_US3  3
+#define SUBARCH_US      1
+#define SUBARCH_US3     3
 
 typedef struct {
@@ -70 +70 @@
 extern uint32_t silo_ramdisk_size;
 
+extern bootinfo_t bootinfo;
+
 extern void start(void);
 extern void bootstrap(void);

boot/arch/sparc64/loader/ofwarch.c

@@ -30 +30 @@
 /**
  * @file
- * @brief Architecture dependent parts of OpenFirmware interface.
+ * @brief       Architecture dependent parts of OpenFirmware interface.
  */
 
@@ -40 +40 @@
 #include "main.h"
 #include "asm.h"
+
+/* these tho variables will be set by the detect_subarchitecture function */
+extern uint8_t subarchitecture;
+extern uint16_t mid_mask;
 
 void write(const char *str, const int len)
@@ -61 +65 @@
  * except for the current CPU.
  *
- * @param child         The first child of the OFW tree node whose children
- *                      represent CPUs to be woken up.
- * @param current_mid   MID of the current CPU, the current CPU will
- *                      (of course) not be woken up.
- * @param physmem_start Starting address of the physical memory.
- *
- * @return Number of CPUs which have the same parent node as
- *         "child".
- *
+ * @param child         The first child of the OFW tree node whose children
+ *                      represent CPUs to be woken up.
+ * @param current_mid   MID of the current CPU, the current CPU will
+ *                      (of course) not be woken up.
+ * @return              Number of CPUs which have the same parent node as
+ *                      "child".
  */
-static int wake_cpus_in_node(phandle child, uint64_t current_mid,
-    uintptr_t physmem_start)
+static int wake_cpus_in_node(phandle child, uint64_t current_mid)
 {
         int cpus;
+        char type_name[BUF_SIZE];
         
-        for (cpus = 0; (child != 0) && (child != -1);
+        for (cpus = 0; child != 0 && child != -1;
             child = ofw_get_peer_node(child), cpus++) {
-                char type_name[BUF_SIZE];
-                
                 if (ofw_get_property(child, "device_type", type_name,
                     sizeof(type_name)) > 0) {
@@ -89 +88 @@
                                  * "cpuid" for US-IV
                                  */
-                                if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0)
-                                    && (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0)
-                                    && (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
+                                if (ofw_get_property(
+                                    child, "upa-portid",
+                                    &mid, sizeof(mid)) <= 0
+                                    && ofw_get_property(child, "portid",
+                                    &mid, sizeof(mid)) <= 0
+                                    && ofw_get_property(child, "cpuid",
+                                    &mid, sizeof(mid)) <= 0)
                                         continue;
-                                
+                                        
                                 if (current_mid != mid) {
                                         /*
@@ -100 +103 @@
                                         (void) ofw_call("SUNW,start-cpu", 3, 1,
                                             NULL, child, KERNEL_VIRTUAL_ADDRESS,
-                                            physmem_start | AP_PROCESSOR);
+                                            bootinfo.physmem_start |
+                                            AP_PROCESSOR);
                                 }
                         }
                 }
         }
-        
+
         return cpus;
 }
@@ -112 +116 @@
  * Finds out the current CPU's MID and wakes up all AP processors.
  */
-int ofw_cpu(uint16_t mid_mask, uintptr_t physmem_start)
+int ofw_cpu(void)
 {
-        /* Get the current CPU MID */
+        int cpus;
+        phandle node;
+        phandle subnode;
+        phandle cpus_parent;
+        phandle cmp;
+        char name[BUF_SIZE];
+
+        /* get the current CPU MID */
         uint64_t current_mid;
         
-        asm volatile (
-                "ldxa [%1] %2, %0\n"
-                : "=r" (current_mid)
-                : "r" (0), "i" (ASI_ICBUS_CONFIG)
-        );
+        asm volatile ("ldxa [%1] %2, %0\n"
+            : "=r" (current_mid)
+            : "r" (0), "i" (ASI_ICBUS_CONFIG));
+        current_mid >>= ICBUS_CONFIG_MID_SHIFT;
+
+        current_mid &= mid_mask;
+
+        /* wake up CPUs */
         
-        current_mid >>= ICBUS_CONFIG_MID_SHIFT;
-        current_mid &= mid_mask;
-        
-        /* Wake up the CPUs */
-        
-        phandle cpus_parent = ofw_find_device("/ssm@0,0");
-        if ((cpus_parent == 0) || (cpus_parent == -1))
+        cpus_parent = ofw_find_device("/ssm@0,0");
+        if (cpus_parent == 0 || cpus_parent == -1) {
                 cpus_parent = ofw_find_device("/");
-        
-        phandle node = ofw_get_child_node(cpus_parent);
-        int cpus = wake_cpus_in_node(node, current_mid, physmem_start);
-        while ((node != 0) && (node != -1)) {
-                char name[BUF_SIZE];
-                
+        }
+
+        node = ofw_get_child_node(cpus_parent);
+        cpus = wake_cpus_in_node(node, current_mid);
+        while (node != 0 && node != -1) {
                 if (ofw_get_property(node, "name", name,
-                    sizeof(name)) > 0) {
+                        sizeof(name)) > 0) {
                         if (strcmp(name, "cmp") == 0) {
-                                phandle subnode = ofw_get_child_node(node);
+                                subnode = ofw_get_child_node(node);
                                 cpus += wake_cpus_in_node(subnode,
-                                        current_mid, physmem_start);
+                                        current_mid);
                         }
                 }
@@ -149 +157 @@
         
         return cpus;
+        
 }
 
 /** Get physical memory starting address.
  *
- * @param start Pointer to variable where the physical memory starting
- *              address will be stored.
+ * @param start         Pointer to variable where the physical memory starting
+ *                      address will be stored.
  *
- * @return Non-zero on succes, zero on failure.
- *
+ * @return              Non-zero on succes, zero on failure.
  */
 int ofw_get_physmem_start(uintptr_t *start)
 {
         uint32_t memreg[4];
+
         if (ofw_get_property(ofw_memory, "reg", &memreg, sizeof(memreg)) <= 0)
                 return 0;
-        
+
         *start = (((uint64_t) memreg[0]) << 32) | memreg[1];
         return 1;
 }
+

boot/arch/sparc64/loader/ofwarch.h

@@ -33 +33 @@
 #include "types.h"
 
-#define OFW_ADDRESS_CELLS  2
-#define OFW_SIZE_CELLS     2
+#define OFW_ADDRESS_CELLS       2
+#define OFW_SIZE_CELLS          2
 
-extern int ofw_cpu(uint16_t mid_mask, uintptr_t physmem_start);
-extern int ofw_get_physmem_start(uintptr_t *start);
+extern int ofw_cpu(void);
+extern int ofw_get_physmem_start(uintptr_t *start); 
 
 #endif

boot/arch/sparc64/loader/register.h

@@ -30 +30 @@
 #define BOOT_sparc64_REGISTER_H_
 
-#define PSTATE_IE_BIT    2
-#define PSTATE_PRIV_BIT  4
-#define PSTATE_AM_BIT    8
+#define PSTATE_IE_BIT   2
+#define PSTATE_PRIV_BIT 4
+#define PSTATE_AM_BIT   8
 
-#define ASI_ICBUS_CONFIG        0x4a
-#define ICBUS_CONFIG_MID_SHIFT  17
+#define ASI_ICBUS_CONFIG                0x4a
+#define ICBUS_CONFIG_MID_SHIFT          17
 
 #endif

boot/arch/sparc64/loader/stack.h

@@ -30 +30 @@
 #define BOOT_sparc64_STACK_H_
 
-#define STACK_ALIGNMENT              16
-#define STACK_BIAS                   2047
-#define STACK_WINDOW_SAVE_AREA_SIZE  (16 * 8)
+#define STACK_ALIGNMENT                 16
+#define STACK_BIAS                      2047
+#define STACK_WINDOW_SAVE_AREA_SIZE     (16*8)
 
 #endif

boot/genarch/balloc.c

@@ -28 +28 @@
 
 #include <balloc.h>
-#include <asm.h>
 #include <types.h>
 #include <align.h>
 
 static ballocs_t *ballocs;
-static uintptr_t phys_base;
 
-void balloc_init(ballocs_t *ball, uintptr_t base, uintptr_t kernel_base)
+void balloc_init(ballocs_t *b, uintptr_t base)
 {
-        ballocs = ball;
-        phys_base = base;
-        ballocs->base = kernel_base;
+        ballocs = b;
+        ballocs->base = base;
         ballocs->size = 0;
 }
@@ -45 +42 @@
 void *balloc(size_t size, size_t alignment)
 {
+        uintptr_t addr;
+
         /* Enforce minimal alignment. */
         alignment = ALIGN_UP(alignment, 4);
         
-        uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment);
-        
+        addr = ballocs->base + ALIGN_UP(ballocs->size, alignment);
+
         if (ALIGN_UP(ballocs->size, alignment) + size > BALLOC_MAX_SIZE)
                 return NULL;
-        
+                
         ballocs->size = ALIGN_UP(ballocs->size, alignment) + size;
         
         return (void *) addr;
 }
-
-void *balloc_rebase(void *ptr)
-{
-        return (void *) ((uintptr_t) ptr - phys_base + ballocs->base);
-}

boot/genarch/balloc.h

@@ -32 +32 @@
 #include <types.h>
 
+#define BALLOC_MAX_SIZE         (128 * 1024)
+
 typedef struct {
         uintptr_t base;
@@ -37 +39 @@
 } ballocs_t;
 
-extern void balloc_init(ballocs_t *ball, uintptr_t base, uintptr_t kernel_base);
+extern void balloc_init(ballocs_t *b, uintptr_t base);
 extern void *balloc(size_t size, size_t alignment);
-extern void *balloc_rebase(void *ptr);
 
 #endif

boot/genarch/ofw.c

@@ -33 +33 @@
 #include <types.h>
 
-#define RED(i)    (((i) >> 5) & ((1 << 3) - 1))
-#define GREEN(i)  (((i) >> 3) & ((1 << 2) - 1))
-#define BLUE(i)   ((i) & ((1 << 3) - 1))
-#define CLIP(i)   ((i) <= 255 ? (i) : 255)
-
 uintptr_t ofw_cif;
 
@@ -90 +85 @@
 /** Perform a call to OpenFirmware client interface.
  *
- * @param service String identifying the service requested.
- * @param nargs   Number of input arguments.
- * @param nret    Number of output arguments. This includes the return
- *                value.
- * @param rets    Buffer for output arguments or NULL. The buffer must
- *                accommodate nret - 1 items.
- *
- * @return Return value returned by the client interface.
- *
+ * @param service       String identifying the service requested.
+ * @param nargs         Number of input arguments.
+ * @param nret          Number of output arguments. This includes the return
+ *                      value.
+ * @param rets          Buffer for output arguments or NULL. The buffer must
+ *                      accommodate nret - 1 items.
+ *
+ * @return              Return value returned by the client interface.
  */
 unsigned long
@@ -227 +221 @@
 }
 
-void *ofw_claim_virt(const void *virt, const unsigned int len)
+void *ofw_claim_virt(const void *virt, const int len)
 {
         ofw_arg_t retaddr;
@@ -240 +234 @@
 }
 
-static void *ofw_claim_phys_internal(const void *phys, const unsigned int len, const unsigned int alignment)
-{
-        /*
-         * Note that the return value check will help
-         * us to discover conflicts between OpenFirmware
-         * allocations and our use of physical memory.
-         * It is better to detect collisions here
-         * than to cope with weird errors later.
-         *
-         * So this is really not to make the loader
-         * more generic; it is here for debugging
-         * purposes.
-         */
-        
+void *ofw_claim_phys(const void *phys, const int len)
+{
+        ofw_arg_t retaddr[2];
+        int shift;
+
         if (sizeof(unative_t) == 8) {
-                ofw_arg_t retaddr[2];
-                int shift = 32;
-                
+                shift = 32;
                 if (ofw_call("call-method", 6, 3, retaddr, "claim",
-                    ofw_memory_prop, alignment, len, ((uintptr_t) phys) >> shift,
+                    ofw_memory_prop, 0, len, ((uintptr_t) phys) >> shift,
                     ((uintptr_t) phys) & ((uint32_t) -1)) != 0) {
+                        /*
+                         * Note that this will help us to discover
+                         * conflicts between OpenFirmware allocations
+                         * and our use of physical memory.
+                         * It is better to detect collisions here
+                         * than to cope with weird errors later.
+                         *
+                         * So this is really not to make the loader
+                         * more generic; it is here for debugging
+                         * purposes.
+                         */
                         puts("Error: memory method claim() failed, halting.\n");
                         halt();
                 }
-                
-                return (void *) ((retaddr[0] << shift) | retaddr[1]);
         } else {
-                ofw_arg_t retaddr[1];
-                
-                if (ofw_call("call-method", 5, 2, retaddr, "claim",
-                    ofw_memory_prop, alignment, len, (uintptr_t) phys) != 0) {
-                        puts("Error: memory method claim() failed, halting.\n");
-                        halt();
-                }
-                
-                return (void *) retaddr[0];
-        }
-}
-
-void *ofw_claim_phys(const void *phys, const unsigned int len)
-{
-        return ofw_claim_phys_internal(phys, len, 0);
-}
-
-void *ofw_claim_phys_any(const unsigned int len, const unsigned int alignment)
-{
-        return ofw_claim_phys_internal(NULL, len, alignment);
-}
-
-int ofw_map(const void *phys, const void *virt, const unsigned int size, const int mode)
+                shift = 0;
+                /*
+                 * FIXME: the number of arguments is probably different...
+                 */
+                puts("Error: 32-bit ofw_claim_phys not implemented.\n");
+                halt();
+        }
+
+        return (void *) ((retaddr[0] << shift) | retaddr[1]);
+}
+
+int ofw_map(const void *phys, const void *virt, const int size, const int mode)
 {
         uintptr_t phys_hi, phys_lo;
@@ -333 +314 @@
 
                 /*
-                 * This is a hot fix of the issue which occurs on machines
-                 * where there are holes in the physical memory (such as
-                 * SunBlade 1500). Should we detect a hole in the physical
-                 * memory, we will ignore any memory detected behind
-                 * the hole and pretend the hole does not exist.
+                 * This is a hot fix of the issue which occurs on machines
+                 * where there are holes in the physical memory (such as
+                 * SunBlade 1500). Should we detect a hole in the physical
+                 * memory, we will ignore any memory detected behind
+                 * the hole and pretend the hole does not exist.
                  */
                 if ((map->count > 0) && (map->zones[map->count - 1].start +
@@ -354 +335 @@
 }
 
+int ofw_screen(screen_t *screen)
+{
+        char device_name[BUF_SIZE];
+        uint32_t virtaddr;
+        
+        if (ofw_get_property(ofw_aliases, "screen", device_name,
+            sizeof(device_name)) <= 0)
+                return false;
+        
+        phandle device = ofw_find_device(device_name);
+        if (device == -1)
+                return false;
+        
+        if (ofw_get_property(device, "address", &virtaddr,
+            sizeof(virtaddr)) <= 0)
+                return false;
+
+        screen->addr = (void *) ((uintptr_t) virtaddr);
+
+        if (ofw_get_property(device, "width", &screen->width,
+            sizeof(screen->width)) <= 0)
+                return false;
+        
+        if (ofw_get_property(device, "height", &screen->height,
+            sizeof(screen->height)) <= 0)
+                return false;
+        
+        if (ofw_get_property(device, "depth", &screen->bpp,
+            sizeof(screen->bpp)) <= 0)
+                return false;
+        
+        if (ofw_get_property(device, "linebytes", &screen->scanline,
+            sizeof(screen->scanline)) <= 0)
+                return false;
+        
+        return true;
+}
+
+#define RED(i)    (((i) >> 5) & ((1 << 3) - 1))
+#define GREEN(i)  (((i) >> 3) & ((1 << 2) - 1))
+#define BLUE(i)   ((i) & ((1 << 3) - 1))
+#define CLIP(i)   ((i) <= 255 ? (i) : 255)
+
+
 /**
  * Sets up the palette for the 8-bit color depth configuration so that the
@@ -367 +392 @@
         char device_name[BUF_SIZE];
         
-        /* Resolve alias */
+        /* resolve alias */
         if (ofw_get_property(ofw_aliases, "screen", device_name,
             sizeof(device_name)) <= 0)
                 return false;
         
-        /* For depth greater than 8 it makes no sense to set up the palette */
+        /* for depth greater than 8 it makes no sense to set up the palette */
         uint32_t depth;
         phandle device = ofw_find_device(device_name);
@@ -382 +407 @@
                 return false;
         
-        /* Required in order to be able to make a method call */
+        /* required in order to be able to make a method call */
         ihandle screen = ofw_open(device_name);
         if (screen == -1)
                 return false;
         
-        /* Setup the palette so that the (inverted) 3:2:3 scheme is usable */
+        /* setup the palette so that the (inverted) 3:2:3 scheme is usable */
         unsigned int i;
         for (i = 0; i < 256; i++)

boot/genarch/ofw.h

@@ -33 +33 @@
 #include <stdarg.h>
 
-#define BUF_SIZE  1024
+#define BUF_SIZE                1024
 
-#define MEMMAP_MAX_RECORDS  32
+#define MEMMAP_MAX_RECORDS      32
 
-#define MAX_OFW_ARGS  12
+#define MAX_OFW_ARGS            12
 
 typedef unative_t ofw_arg_t;
@@ -47 +47 @@
  */
 typedef struct {
-        ofw_arg_t service;             /**< Command name. */
-        ofw_arg_t nargs;               /**< Number of in arguments. */
-        ofw_arg_t nret;                /**< Number of out arguments. */
-        ofw_arg_t args[MAX_OFW_ARGS];  /**< List of arguments. */
+        ofw_arg_t service;              /**< Command name. */
+        ofw_arg_t nargs;                /**< Number of in arguments. */
+        ofw_arg_t nret;                 /**< Number of out arguments. */
+        ofw_arg_t args[MAX_OFW_ARGS];   /**< List of arguments. */
 } ofw_args_t;
 
@@ -63 +63 @@
         memzone_t zones[MEMMAP_MAX_RECORDS];
 } memmap_t;
+
+typedef struct {
+        void *addr;
+        uint32_t width;
+        uint32_t height;
+        uint32_t bpp;
+        uint32_t scanline;
+} screen_t;
+
+typedef struct {
+        void *addr;
+        uint32_t size;
+} macio_t;
 
 typedef struct {
@@ -105 +118 @@
 extern void *ofw_translate(const void *virt);
 extern int ofw_translate_failed(ofw_arg_t flag);
-extern void *ofw_claim_virt(const void *virt, const unsigned int len);
-extern void *ofw_claim_phys(const void *virt, const unsigned int len);
-extern void *ofw_claim_phys_any(const unsigned int len, const unsigned int alignment);
-extern int ofw_map(const void *phys, const void *virt, const unsigned int size, const int mode);
+extern void *ofw_claim_virt(const void *virt, const int len);
+extern void *ofw_claim_phys(const void *virt, const int len);
+extern int ofw_map(const void *phys, const void *virt, const int size, const int mode);
 extern int ofw_memmap(memmap_t *map);
+extern int ofw_screen(screen_t *screen);
+extern int ofw_macio(macio_t *macio);
 extern int ofw_setup_palette(void);
 extern void ofw_quiesce(void);

boot/genarch/ofw_tree.c

@@ -29 +29 @@
 #include <ofw_tree.h>
 #include <ofw.h>
-#include <ofwarch.h>
 #include <types.h>
 #include <string.h>
 #include <balloc.h>
 #include <asm.h>
-#include <memstr.h>
-
-#define MAX_PATH_LEN  256
+
+#define MAX_PATH_LEN    256
 
 static ofw_tree_node_t *ofw_tree_node_alloc(void)
@@ -51 +49 @@
 static void *ofw_tree_space_alloc(size_t size)
 {
+        char *addr;
+
         /*
          * What we do here is a nasty hack :-)
@@ -61 +61 @@
          * behind the requested memory.
          */
-        char *addr = balloc(size + 1, size);
+        addr = balloc(size + 1, size);
         if (addr)
                 addr[size] = '\0';
-        
         return addr;
 }
@@ -76 +75 @@
  * order to prevent stack from overflowing.
  *
- * @param current_node Pointer to uninitialized ofw_tree_node structure that
- *                     will become the memory represenation of 'current'.
- * @param parent_node  Parent ofw_tree_node structure or NULL in case of root
- *                     node.
- * @param current      OpenFirmware phandle to the current device tree node.
- *
+ * @param current_node  Pointer to uninitialized ofw_tree_node structure that
+ *                      will become the memory represenation of 'current'.
+ * @param parent_node   Parent ofw_tree_node structure or NULL in case of root
+ *                      node.
+ * @param current       OpenFirmware phandle to the current device tree node.
  */
 static void ofw_tree_node_process(ofw_tree_node_t *current_node,
     ofw_tree_node_t *parent_node, phandle current)
 {
+        static char path[MAX_PATH_LEN + 1];
+        static char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
+        static char name2[OFW_TREE_PROPERTY_MAX_NAMELEN];
+        phandle peer;
+        phandle child;
+        size_t len;
+        int i;
+
         while (current_node) {
                 /*
                  * Initialize node.
                  */
-                current_node->parent = (ofw_tree_node_t *) balloc_rebase(parent_node);
+                current_node->parent = parent_node;
                 current_node->peer = NULL;
                 current_node->child = NULL;
@@ -97 +103 @@
                 current_node->property = NULL;
                 current_node->device = NULL;
-                
+        
                 /*
                  * Get the disambigued name.
                  */
-                static char path[MAX_PATH_LEN + 1];
-                size_t len = ofw_package_to_path(current, path, MAX_PATH_LEN);
+                len = ofw_package_to_path(current, path, MAX_PATH_LEN);
                 if (len == -1)
                         return;
-                
+        
                 path[len] = '\0';
-                
-                /* Find last slash */
-                int i;
-                for (i = len - 1; (i >= 0) && (path[i] != '/'); i--);
-                
-                /* Do not include the slash */
-                i++;
+                for (i = len - 1; i >= 0 && path[i] != '/'; i--)
+                        ;
+                i++;    /* do not include '/' */
+        
                 len -= i;
-                
-                /* Add space for trailing '\0' */
-                char *da_name = ofw_tree_space_alloc(len + 1);
-                if (!da_name)
-                        return;
-                
-                memcpy(da_name, &path[i], len);
-                da_name[len] = '\0';
-                current_node->da_name = (char *) balloc_rebase(da_name);
-                
+
+                /* add space for trailing '\0' */
+                current_node->da_name = ofw_tree_space_alloc(len + 1);
+                if (!current_node->da_name)
+                        return;
+        
+                memcpy(current_node->da_name, &path[i], len);
+                current_node->da_name[len] = '\0';
+        
                 /*
                  * Recursively process the potential child node.
                  */
-                phandle child = ofw_get_child_node(current);
-                if ((child != 0) && (child != -1)) {
-                        ofw_tree_node_t *child_node = ofw_tree_node_alloc();
+                child = ofw_get_child_node(current);
+                if (child != 0 && child != -1) {
+                        ofw_tree_node_t *child_node;
+                
+                        child_node = ofw_tree_node_alloc();
                         if (child_node) {
                                 ofw_tree_node_process(child_node, current_node,
                                     child);
-                                current_node->child =
-                                    (ofw_tree_node_t *) balloc_rebase(child_node);
+                                current_node->child = child_node;
                         }
                 }
-                
+        
                 /*
                  * Count properties.
                  */
-                static char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
-                static char name2[OFW_TREE_PROPERTY_MAX_NAMELEN];
                 name[0] = '\0';
                 while (ofw_next_property(current, name, name2) == 1) {
@@ -149 +149 @@
                         memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
                 }
-                
+
                 if (!current_node->properties)
                         return;
-                
+        
                 /*
                  * Copy properties.
                  */
-                ofw_tree_property_t *property =
+                current_node->property =
                     ofw_tree_properties_alloc(current_node->properties);
-                if (!property)
+                if (!current_node->property)
                         return;
                 
                 name[0] = '\0';
                 for (i = 0; ofw_next_property(current, name, name2) == 1; i++) {
+                        size_t size;
+                
                         if (i == current_node->properties)
                                 break;
+                
+                        memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
+                        memcpy(current_node->property[i].name, name,
+                            OFW_TREE_PROPERTY_MAX_NAMELEN);
+                        current_node->property[i].name[
+                            OFW_TREE_PROPERTY_MAX_NAMELEN] = '\0';
+
+                        size = ofw_get_proplen(current, name);
+                        current_node->property[i].size = size;
+                        if (size) {
+                                void *buf;
                         
-                        memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN);
-                        memcpy(property[i].name, name, OFW_TREE_PROPERTY_MAX_NAMELEN);
-                        property[i].name[OFW_TREE_PROPERTY_MAX_NAMELEN] = '\0';
-                        
-                        size_t size = ofw_get_proplen(current, name);
-                        property[i].size = size;
-                        
-                        if (size) {
-                                void *buf = ofw_tree_space_alloc(size);
-                                if (buf) {
+                                buf = ofw_tree_space_alloc(size);
+                                if (current_node->property[i].value = buf) {
                                         /*
                                          * Copy property value to memory node.
                                          */
-                                        (void) ofw_get_property(current, name, buf, size);
-                                        property[i].value = balloc_rebase(buf);
+                                        (void) ofw_get_property(current, name,
+                                            buf, size);
                                 }
-                        } else
-                                property[i].value = NULL;
-                }
-                
+                        } else {
+                                current_node->property[i].value = NULL;
+                        }
+                }
+
                 /* Just in case we ran out of memory. */
                 current_node->properties = i;
-                current_node->property = (ofw_tree_property_t *) balloc_rebase(property);
-                
-                
+
                 /*
                  * Iteratively process the next peer node.
@@ -198 +202 @@
                  * risk of overflowing the stack is too real.
                  */
-                phandle peer = ofw_get_peer_node(current);
-                if ((peer != 0) && (peer != -1)) {
-                        ofw_tree_node_t *peer_node = ofw_tree_node_alloc();
-                        if (peer_node) {
-                                current_node->peer = (ofw_tree_node_t *) balloc_rebase(peer_node);
+                peer = ofw_get_peer_node(current);
+                if (peer != 0 && peer != -1) {
+                        ofw_tree_node_t *peer_node;
+                
+                        peer_node = ofw_tree_node_alloc();
+                        if (peer_node) { 
+                                current_node->peer = peer_node;
                                 current_node = peer_node;
                                 current = peer;
@@ -211 +217 @@
                         }
                 }
-                
                 /*
                  * No more peers on this level.
@@ -221 +226 @@
 /** Construct memory representation of OpenFirmware device tree.
  *
- * @return NULL on failure or kernel pointer to the root node.
- *
+ * @return              NULL on failure or pointer to the root node.
  */
 ofw_tree_node_t *ofw_tree_build(void)
 {
-        ofw_tree_node_t *root = ofw_tree_node_alloc();
+        ofw_tree_node_t *root;
+        phandle ssm_node;
+        ofw_tree_node_t *ssm;
+        
+        root = ofw_tree_node_alloc();
         if (root)
                 ofw_tree_node_process(root, NULL, ofw_root);
-        
+
         /*
          * The firmware client interface does not automatically include the
@@ -235 +243 @@
          * solution is to explicitly stick "ssm" to the OFW tree.
          */
-        phandle ssm_node = ofw_find_device("/ssm@0,0");
+        ssm_node = ofw_find_device("/ssm@0,0");
         if (ssm_node != -1) {
-                ofw_tree_node_t *ssm = ofw_tree_node_alloc();
+                ssm = ofw_tree_node_alloc();
                 if (ssm) {
                         ofw_tree_node_process(ssm, root,
                             ofw_find_device("/ssm@0,0"));
                         ssm->peer = root->child;
-                        root->child = (ofw_tree_node_t *) balloc_rebase(ssm);
+                        root->child = ssm;
                 }
         }
         
-        return (ofw_tree_node_t *) balloc_rebase(root);
-}
+        return root;
+}

boot/genarch/ofw_tree.h

@@ -33 +33 @@
 #include <ofw.h>
 
-#define OFW_TREE_PROPERTY_MAX_NAMELEN  32
+#define OFW_TREE_PROPERTY_MAX_NAMELEN   32
+
+typedef struct ofw_tree_node ofw_tree_node_t;
+typedef struct ofw_tree_property ofw_tree_property_t;
+
+/** Memory representation of OpenFirmware device tree node. */
+struct ofw_tree_node {
+        ofw_tree_node_t *parent;
+        ofw_tree_node_t *peer;
+        ofw_tree_node_t *child;
+
+        uint32_t node_handle;                   /**< Old OpenFirmware node handle. */
+
+        char *da_name;                          /**< Disambigued name. */
+
+        unsigned properties;                    /**< Number of properties. */
+        ofw_tree_property_t *property;
+        
+        void *device;                           /**< Member used solely by the kernel. */
+};
 
 /** Memory representation of OpenFirmware device tree node property. */
-typedef struct {
+struct ofw_tree_property {
         char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
         size_t size;
         void *value;
-} ofw_tree_property_t;
-
-/** Memory representation of OpenFirmware device tree node. */
-typedef struct ofw_tree_node {
-        struct ofw_tree_node *parent;
-        struct ofw_tree_node *peer;
-        struct ofw_tree_node *child;
-        
-        uint32_t node_handle;           /**< Old OpenFirmware node handle. */
-        
-        char *da_name;                  /**< Disambigued name. */
-        
-        unsigned int properties;        /**< Number of properties. */
-        ofw_tree_property_t *property;
-        
-        void *device;                   /**< Member used solely by the kernel. */
-} ofw_tree_node_t;
+};
 
 extern ofw_tree_node_t *ofw_tree_build(void);

boot/generic/printf.c

@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup generic 
  * @{
  */

boot/generic/printf.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic
+/** @addtogroup generic 
  * @{
  */

boot/generic/stdarg.h

@@ -38 +38 @@
 typedef __builtin_va_list va_list;
 
-#define va_start(ap, last)   __builtin_va_start(ap, last)
-#define va_arg(ap, type)     __builtin_va_arg(ap, type)
-#define va_end(ap)           __builtin_va_end(ap)
+#define va_start(ap, last)              __builtin_va_start(ap, last)
+#define va_arg(ap, type)                __builtin_va_arg(ap, type)
+#define va_end(ap)                      __builtin_va_end(ap)
 
 #endif

kernel/arch/ia64/src/drivers/ski.c

@@ -129 +129 @@
         
         outdev_initialize("skiout", &skiout, &skiout_ops);
-        stdout_wire(&skiout);
+        stdout = &skiout;
         
         sysinfo_set_item_val("fb", NULL, false);

kernel/arch/ppc32/include/asm/regname.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32
+/** @addtogroup ppc32   
  * @{
  */
@@ -37 +37 @@
 
 /* Condition Register Bit Fields */
-#define cr0  0
-#define cr1  1
-#define cr2  2
-#define cr3  3
-#define cr4  4
-#define cr5  5
-#define cr6  6
-#define cr7  7
+#define cr0     0
+#define cr1     1
+#define cr2     2
+#define cr3     3
+#define cr4     4
+#define cr5     5
+#define cr6     6
+#define cr7     7
 
 /* General Purpose Registers (GPRs) */
-#define r0   0
-#define r1   1
-#define r2   2
-#define r3   3
-#define r4   4
-#define r5   5
-#define r6   6
-#define r7   7
-#define r8   8
-#define r9   9
-#define r10  10
-#define r11  11
-#define r12  12
-#define r13  13
-#define r14  14
-#define r15  15
-#define r16  16
-#define r17  17
-#define r18  18
-#define r19  19
-#define r20  20
-#define r21  21
-#define r22  22
-#define r23  23
-#define r24  24
-#define r25  25
-#define r26  26
-#define r27  27
-#define r28  28
-#define r29  29
-#define r30  30
-#define r31  31
+#define r0      0
+#define r1      1
+#define r2      2
+#define r3      3
+#define r4      4
+#define r5      5
+#define r6      6
+#define r7      7
+#define r8      8
+#define r9      9
+#define r10     10
+#define r11     11
+#define r12     12
+#define r13     13
+#define r14     14
+#define r15     15
+#define r16     16
+#define r17     17
+#define r18     18
+#define r19     19
+#define r20     20
+#define r21     21
+#define r22     22
+#define r23     23
+#define r24     24
+#define r25     25
+#define r26     26
+#define r27     27
+#define r28     28
+#define r29     29
+#define r30     30
+#define r31     31
 
 /* GPR Aliases */
-#define sp  1
+#define sp      1
 
 /* Floating Point Registers (FPRs) */
-#define fr0   0
-#define fr1   1
-#define fr2   2
-#define fr3   3
-#define fr4   4
-#define fr5   5
-#define fr6   6
-#define fr7   7
-#define fr8   8
-#define fr9   9
-#define fr10  10
-#define fr11  11
-#define fr12  12
-#define fr13  13
-#define fr14  14
-#define fr15  15
-#define fr16  16
-#define fr17  17
-#define fr18  18
-#define fr19  19
-#define fr20  20
-#define fr21  21
-#define fr22  22
-#define fr23  23
-#define fr24  24
-#define fr25  25
-#define fr26  26
-#define fr27  27
-#define fr28  28
-#define fr29  29
-#define fr30  30
-#define fr31  31
-
-#define vr0   0
-#define vr1   1
-#define vr2   2
-#define vr3   3
-#define vr4   4
-#define vr5   5
-#define vr6   6
-#define vr7   7
-#define vr8   8
-#define vr9   9
-#define vr10  10
-#define vr11  11
-#define vr12  12
-#define vr13  13
-#define vr14  14
-#define vr15  15
-#define vr16  16
-#define vr17  17
-#define vr18  18
-#define vr19  19
-#define vr20  20
-#define vr21  21
-#define vr22  22
-#define vr23  23
-#define vr24  24
-#define vr25  25
-#define vr26  26
-#define vr27  27
-#define vr28  28
-#define vr29  29
-#define vr30  30
-#define vr31  31
-
-#define evr0   0
-#define evr1   1
-#define evr2   2
-#define evr3   3
-#define evr4   4
-#define evr5   5
-#define evr6   6
-#define evr7   7
-#define evr8   8
-#define evr9   9
-#define evr10  10
-#define evr11  11
-#define evr12  12
-#define evr13  13
-#define evr14  14
-#define evr15  15
-#define evr16  16
-#define evr17  17
-#define evr18  18
-#define evr19  19
-#define evr20  20
-#define evr21  21
-#define evr22  22
-#define evr23  23
-#define evr24  24
-#define evr25  25
-#define evr26  26
-#define evr27  27
-#define evr28  28
-#define evr29  29
-#define evr30  30
-#define evr31  31
+#define fr0             0
+#define fr1             1
+#define fr2             2
+#define fr3             3
+#define fr4             4
+#define fr5             5
+#define fr6             6
+#define fr7             7
+#define fr8             8
+#define fr9             9
+#define fr10    10
+#define fr11    11
+#define fr12    12
+#define fr13    13
+#define fr14    14
+#define fr15    15
+#define fr16    16
+#define fr17    17
+#define fr18    18
+#define fr19    19
+#define fr20    20
+#define fr21    21
+#define fr22    22
+#define fr23    23
+#define fr24    24
+#define fr25    25
+#define fr26    26
+#define fr27    27
+#define fr28    28
+#define fr29    29
+#define fr30    30
+#define fr31    31
+
+#define vr0             0
+#define vr1             1
+#define vr2             2
+#define vr3             3
+#define vr4             4
+#define vr5             5
+#define vr6             6
+#define vr7             7
+#define vr8             8
+#define vr9             9
+#define vr10    10
+#define vr11    11
+#define vr12    12
+#define vr13    13
+#define vr14    14
+#define vr15    15
+#define vr16    16
+#define vr17    17
+#define vr18    18
+#define vr19    19
+#define vr20    20
+#define vr21    21
+#define vr22    22
+#define vr23    23
+#define vr24    24
+#define vr25    25
+#define vr26    26
+#define vr27    27
+#define vr28    28
+#define vr29    29
+#define vr30    30
+#define vr31    31
+
+#define evr0    0
+#define evr1    1
+#define evr2    2
+#define evr3    3
+#define evr4    4
+#define evr5    5
+#define evr6    6
+#define evr7    7
+#define evr8    8
+#define evr9    9
+#define evr10   10
+#define evr11   11
+#define evr12   12
+#define evr13   13
+#define evr14   14
+#define evr15   15
+#define evr16   16
+#define evr17   17
+#define evr18   18
+#define evr19   19
+#define evr20   20
+#define evr21   21
+#define evr22   22
+#define evr23   23
+#define evr24   24
+#define evr25   25
+#define evr26   26
+#define evr27   27
+#define evr28   28
+#define evr29   29
+#define evr30   30
+#define evr31   31
 
 /* Special Purpose Registers (SPRs) */
-#define xer      1
-#define lr       8
-#define ctr      9
-#define dec      22
-#define sdr1     25
-#define srr0     26
-#define srr1     27
-#define sprg0    272
-#define sprg1    273
-#define sprg2    274
-#define sprg3    275
-#define prv      287
-#define ibat0u   528
-#define ibat0l   529
-#define ibat1u   530
-#define ibat1l   531
-#define ibat2u   532
-#define ibat2l   533
-#define ibat3u   534
-#define ibat3l   535
-#define dbat0u   536
-#define dbat0l   537
-#define dbat1u   538
-#define dbat1l   539
-#define dbat2u   540
-#define dbat2l   541
-#define dbat3u   542
-#define dbat3l   543
-#define tlbmiss  980
-#define ptehi    981
-#define ptelo    982
-#define hid0     1008
+#define xer             1
+#define lr              8
+#define ctr             9
+#define dec             22
+#define sdr1    25
+#define srr0    26
+#define srr1    27
+#define sprg0   272
+#define sprg1   273
+#define sprg2   274
+#define sprg3   275
+#define prv             287
+#define ibat0u  528
+#define ibat0l  529
+#define ibat1u  530
+#define ibat1l  531
+#define ibat2u  532
+#define ibat2l  533
+#define ibat3u  534
+#define ibat3l  535
+#define dbat0u  536
+#define dbat0l  537
+#define dbat1u  538
+#define dbat1l  539
+#define dbat2u  540
+#define dbat2l  541
+#define dbat3u  542
+#define dbat3l  543
+#define tlbmiss 980
+#define ptehi   981
+#define ptelo   982
+#define hid0    1008
 
 /* MSR bits */
-#define msr_dr  (1 << 4)
-#define msr_ir  (1 << 5)
-#define msr_pr  (1 << 14)
-#define msr_ee  (1 << 15)
+#define msr_dr  (1 << 4)
+#define msr_ir  (1 << 5)
+#define msr_pr  (1 << 14)
+#define msr_ee  (1 << 15)
 
 /* HID0 bits */
-#define hid0_sten  (1 << 24)
-#define hid0_ice   (1 << 15)
-#define hid0_dce   (1 << 14)
-#define hid0_icfi  (1 << 11)
-#define hid0_dci   (1 << 10)
+#define hid0_sten       (1 << 24)
+#define hid0_ice        (1 << 15)
+#define hid0_dce        (1 << 14)
+#define hid0_icfi       (1 << 11)
+#define hid0_dci        (1 << 10)
 
 #endif

kernel/arch/ppc32/include/boot/boot.h

@@ -41 +41 @@
 #define TEMP_STACK_SIZE  0x1000
 
-#define TASKMAP_MAX_RECORDS        32
-#define MEMMAP_MAX_RECORDS         32
-#define BOOTINFO_TASK_NAME_BUFLEN  32
+#define TASKMAP_MAX_RECORDS  32
+#define MEMMAP_MAX_RECORDS   32
 
 #ifndef __ASM__
 
+#define BOOTINFO_TASK_NAME_BUFLEN 32
+
 #include <arch/types.h>
-#include <config.h>
-#include <genarch/ofw/ofw_tree.h>
 
 typedef struct {
@@ -74 +73 @@
 
 typedef struct {
+        uintptr_t addr;
+        unsigned int width;
+        unsigned int height;
+        unsigned int bpp;
+        unsigned int scanline;
+} screen_t;
+
+typedef struct {
+        uintptr_t addr;
+        unsigned int size;
+} macio_t;
+
+typedef struct {
         memmap_t memmap;
         taskmap_t taskmap;
-        ballocs_t ballocs;
-        ofw_tree_node_t *ofw_root;
+        screen_t screen;
+        macio_t macio;
 } bootinfo_t;
 

kernel/arch/ppc32/src/mm/tlb.c

@@ -45 +45 @@
 static unsigned int seed = 10;
 static unsigned int seed_real __attribute__ ((section("K_UNMAPPED_DATA_START"))) = 42;
+
+
+#define TLB_FLUSH \
+        "tlbie %0\n" \
+        "addi %0, %0, 0x1000\n"
 
 
@@ -446 +451 @@
                 "sync\n"
                 
-                ".rept 64\n"
-                "tlbie %0\n"
-                "addi %0, %0, 0x1000\n"
-                ".endr\n"
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
+                TLB_FLUSH
                 
                 "eieio\n"

kernel/arch/ppc32/src/ppc32.c

@@ -41 +41 @@
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>
-#include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/pci.h>
 #include <userspace.h>
 #include <proc/uarg.h>
@@ -51 +49 @@
 #include <macros.h>
 #include <string.h>
-#include <print.h>
 
 #define IRQ_COUNT  64
@@ -66 +63 @@
         
         for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
-                init.tasks[i].addr = bootinfo.taskmap.tasks[i].addr;
+                init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr);
                 init.tasks[i].size = bootinfo.taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
                     bootinfo.taskmap.tasks[i].name);
         }
-        
-        /* Copy boot allocations info. */
-        ballocs.base = bootinfo.ballocs.base;
-        ballocs.size = bootinfo.ballocs.size;
-        
-        ofw_tree_init(bootinfo.ofw_root);
 }
 
@@ -83 +74 @@
         /* Initialize dispatch table */
         interrupt_init();
-        
+
         /* Start decrementer */
         start_decrementer();
 }
 
-static bool display_register(ofw_tree_node_t *node, void *arg)
-{
-        uintptr_t fb_addr = 0;
-        uint32_t fb_width = 0;
-        uint32_t fb_height = 0;
-        uint32_t fb_scanline = 0;
-        unsigned int visual = VISUAL_UNKNOWN;
-        
-        ofw_tree_property_t *prop = ofw_tree_getprop(node, "address");
-        if ((prop) && (prop->value))
-                fb_addr = *((uintptr_t *) prop->value);
-        
-        prop = ofw_tree_getprop(node, "width");
-        if ((prop) && (prop->value))
-                fb_width = *((uint32_t *) prop->value);
-        
-        prop = ofw_tree_getprop(node, "height");
-        if ((prop) && (prop->value))
-                fb_height = *((uint32_t *) prop->value);
-        
-        prop = ofw_tree_getprop(node, "depth");
-        if ((prop) && (prop->value)) {
-                uint32_t fb_bpp = *((uint32_t *) prop->value);
-                switch (fb_bpp) {
-                case 8:
-                        visual = VISUAL_INDIRECT_8;
-                        break;
-                case 16:
-                        visual = VISUAL_RGB_5_5_5_BE;
-                        break;
-                case 24:
-                        visual = VISUAL_BGR_8_8_8;
-                        break;
-                case 32:
-                        visual = VISUAL_RGB_0_8_8_8;
-                        break;
-                default:
-                        visual = VISUAL_UNKNOWN;
+void arch_post_mm_init(void)
+{
+        if (config.cpu_active == 1) {
+
+#ifdef CONFIG_FB
+                /* Initialize framebuffer */
+                if (bootinfo.screen.addr) {
+                        unsigned int visual;
+                        
+                        switch (bootinfo.screen.bpp) {
+                        case 8:
+                                visual = VISUAL_INDIRECT_8;
+                                break;
+                        case 16:
+                                visual = VISUAL_RGB_5_5_5_BE;
+                                break;
+                        case 24:
+                                visual = VISUAL_BGR_8_8_8;
+                                break;
+                        case 32:
+                                visual = VISUAL_RGB_0_8_8_8;
+                                break;
+                        default:
+                                panic("Unsupported bits per pixel.");
+                        }
+                        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);
                 }
-        }
-        
-        prop = ofw_tree_getprop(node, "linebytes");
-        if ((prop) && (prop->value))
-                fb_scanline = *((uint32_t *) prop->value);
-        
-        if ((fb_addr) && (fb_width > 0) && (fb_height > 0)
-            && (fb_scanline > 0) && (visual != VISUAL_UNKNOWN)) {
-                fb_properties_t fb_prop = {
-                        .addr = fb_addr,
-                        .offset = 0,
-                        .x = fb_width,
-                        .y = fb_height,
-                        .scan = fb_scanline,
-                        .visual = visual,
-                };
-                fb_init(&fb_prop);
-        }
-        
-        /* Consider only a single device for now */
-        return false;
-}
-
-void arch_post_mm_init(void)
-{
-        if (config.cpu_active == 1) {
-#ifdef CONFIG_FB
-                ofw_tree_walk_by_device_type("display", display_register, NULL);
 #endif
                 
@@ -173 +132 @@
 }
 
-static bool macio_register(ofw_tree_node_t *node, void *arg)
-{
-        ofw_pci_reg_t *assigned_address = NULL;
-        
-        ofw_tree_property_t *prop = ofw_tree_getprop(node, "assigned-addresses");
-        if ((prop) && (prop->value))
-                assigned_address = ((ofw_pci_reg_t *) prop->value);
-        
-        if (assigned_address) {
+void arch_post_smp_init(void)
+{
+        if (bootinfo.macio.addr) {
                 /* Initialize PIC */
                 cir_t cir;
                 void *cir_arg;
-                pic_init(assigned_address[0].addr, PAGE_SIZE, &cir, &cir_arg);
-                
+                pic_init(bootinfo.macio.addr, PAGE_SIZE, &cir, &cir_arg);
+
 #ifdef CONFIG_MAC_KBD
-                uintptr_t pa = assigned_address[0].addr + 0x16000;
+                uintptr_t pa = bootinfo.macio.addr + 0x16000;
                 uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE);
                 size_t offset = pa - aligned_addr;
                 size_t size = 2 * PAGE_SIZE;
-                
+                        
                 cuda_t *cuda = (cuda_t *)
                     (hw_map(aligned_addr, offset + size) + offset);
-                
+                        
                 /* Initialize I/O controller */
                 cuda_instance_t *cuda_instance =
@@ -210 +163 @@
 #endif
         }
-        
-        /* Consider only a single device for now */
-        return false;
-}
-
-void arch_post_smp_init(void)
-{
-        ofw_tree_walk_by_device_type("mac-io", macio_register, NULL);
 }
 

kernel/arch/sparc64/include/drivers/fhc.h

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup sparc64 
  * @{
  */

kernel/arch/sparc64/src/drivers/fhc.c

@@ -46 +46 @@
 #include <arch/types.h>
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/fhc.h>
 #include <sysinfo/sysinfo.h>
 

kernel/arch/sparc64/src/drivers/kbd.c

@@ -35 +35 @@
 #include <arch/drivers/kbd.h>
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/fhc.h>
-#include <genarch/ofw/ebus.h>
+
+#ifdef CONFIG_SUN_KBD
+#include <genarch/kbrd/kbrd.h>
+#endif
+#ifdef CONFIG_Z8530
+#include <genarch/drivers/z8530/z8530.h>
+#endif
+#ifdef CONFIG_NS16550
+#include <genarch/drivers/ns16550/ns16550.h>
+#endif
+
 #include <console/console.h>
 #include <ddi/irq.h>
@@ -47 +56 @@
 
 #ifdef CONFIG_SUN_KBD
-#include <genarch/kbrd/kbrd.h>
-#endif
-
-#ifdef CONFIG_Z8530
-#include <genarch/drivers/z8530/z8530.h>
-#endif
-
-#ifdef CONFIG_NS16550
-#include <genarch/drivers/ns16550/ns16550.h>
-#endif
-
-#ifdef CONFIG_SUN_KBD
 
 #ifdef CONFIG_Z8530

kernel/arch/sparc64/src/drivers/pci.c

@@ -37 +37 @@
 #include <arch/drivers/pci.h>
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/upa.h>
 #include <arch/trap/interrupt.h>
 #include <mm/page.h>

kernel/arch/sparc64/src/drivers/scr.c

@@ -35 +35 @@
 #include <arch/drivers/scr.h>
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/pci.h>
-#include <genarch/ofw/sbus.h>
-#include <genarch/ofw/upa.h>
 #include <genarch/fb/fb.h>
 #include <genarch/fb/visuals.h>

kernel/arch/sparc64/src/drivers/sgcn.c

@@ -380 +380 @@
         sysinfo_set_item_val("fb.kind", NULL, 4);
 
-        outdev_initialize("sgcnout", &sgcnout, &sgcnout_ops);
-        stdout_wire(&sgcnout);
+        outdev_initialize("sgcnout", &sgcnout, &sgcnout_ops);   
+        stdout = &sgcnout;
 }
 

kernel/genarch/Makefile.inc

@@ -130 +130 @@
 ifeq ($(CONFIG_OFW_TREE),y)
         GENARCH_SOURCES += \
-                genarch/src/ofw/ofw_tree.c
-endif
-
-ifeq ($(CONFIG_OFW_PCI),y)
-        GENARCH_SOURCES += \
+                genarch/src/ofw/ofw_tree.c \
                 genarch/src/ofw/ebus.c \
                 genarch/src/ofw/fhc.c \
                 genarch/src/ofw/pci.c  \
                 genarch/src/ofw/sbus.c \
-                genarch/src/ofw/upa.c
+                genarch/src/ofw/upa.c 
 endif
 

kernel/genarch/include/fb/fb.h

@@ -68 +68 @@
 
 void fb_redraw(void);
-bool fb_init(fb_properties_t *props);
+void fb_init(fb_properties_t *props);
 
 #endif

kernel/genarch/include/fb/visuals.h

@@ -37 +37 @@
 
 typedef enum {
-        VISUAL_UNKNOWN = 0,
         VISUAL_INDIRECT_8,
         VISUAL_RGB_5_5_5_LE,

kernel/genarch/include/ofw/ofw_tree.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <ddi/irq.h>
 #include <typedefs.h>
 
-#define OFW_TREE_PROPERTY_MAX_NAMELEN  32
-
-/** Memory representation of OpenFirmware device tree node property. */
-typedef struct {
-        char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
-        size_t size;
-        void *value;
-} ofw_tree_property_t;
+#define OFW_TREE_PROPERTY_MAX_NAMELEN   32
+
+typedef struct ofw_tree_node ofw_tree_node_t;
+typedef struct ofw_tree_property ofw_tree_property_t;
 
 /** Memory representation of OpenFirmware device tree node. */
-typedef struct ofw_tree_node {
-        struct ofw_tree_node *parent;
-        struct ofw_tree_node *peer;
-        struct ofw_tree_node *child;
-        
-        uint32_t node_handle;           /**< Old OpenFirmware node handle. */
-        
-        char *da_name;                  /**< Disambigued name. */
-        
-        unsigned int properties;        /**< Number of properties. */
+struct ofw_tree_node {
+        ofw_tree_node_t *parent;
+        ofw_tree_node_t *peer;
+        ofw_tree_node_t *child;
+
+        uint32_t node_handle;           /**< Old OpenFirmware node handle. */
+
+        char *da_name;                  /**< Disambigued name. */
+
+        unsigned properties;            /**< Number of properties. */
         ofw_tree_property_t *property;
         
@@ -60 +57 @@
          */
         void *device;
-} ofw_tree_node_t;
-
-/* Walker for visiting OpenFirmware device tree nodes. */
-typedef bool (* ofw_tree_walker_t)(ofw_tree_node_t *, void *);
+};
+
+/** Memory representation of OpenFirmware device tree node property. */
+struct ofw_tree_property {
+        char name[OFW_TREE_PROPERTY_MAX_NAMELEN];
+        size_t size;
+        void *value;
+};
+
+/*
+ * Definition of 'reg' and 'ranges' properties for various buses.
+ */
+ 
+struct ofw_fhc_reg {
+        uint64_t addr;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_fhc_reg ofw_fhc_reg_t;
+                        
+struct ofw_fhc_range {
+        uint64_t child_base;
+        uint64_t parent_base;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_fhc_range ofw_fhc_range_t;
+
+struct ofw_central_reg {
+        uint64_t addr;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_central_reg ofw_central_reg_t;
+
+struct ofw_central_range {
+        uint64_t child_base;
+        uint64_t parent_base;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_central_range ofw_central_range_t;
+
+struct ofw_ebus_reg {
+        uint32_t space;
+        uint32_t addr;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_ebus_reg ofw_ebus_reg_t;
+
+struct ofw_ebus_range {
+        uint32_t child_space;
+        uint32_t child_base;
+        uint32_t parent_space;
+        uint64_t parent_base;   /* group phys.mid and phys.lo together */
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_ebus_range ofw_ebus_range_t;
+
+struct ofw_ebus_intr_map {
+        uint32_t space;
+        uint32_t addr;
+        uint32_t intr;
+        uint32_t controller_handle;
+        uint32_t controller_ino;
+} __attribute__ ((packed));
+typedef struct ofw_ebus_intr_map ofw_ebus_intr_map_t;
+
+struct ofw_ebus_intr_mask {
+        uint32_t space_mask;
+        uint32_t addr_mask;
+        uint32_t intr_mask;
+} __attribute__ ((packed));
+typedef struct ofw_ebus_intr_mask ofw_ebus_intr_mask_t;
+
+struct ofw_pci_reg {
+        uint32_t space;         /* needs to be masked to obtain pure space id */
+        uint64_t addr;          /* group phys.mid and phys.lo together */
+        uint64_t size;
+} __attribute__ ((packed));
+typedef struct ofw_pci_reg ofw_pci_reg_t;
+
+struct ofw_pci_range {
+        uint32_t space;
+        uint64_t child_base;    /* group phys.mid and phys.lo together */
+        uint64_t parent_base;
+        uint64_t size;
+} __attribute__ ((packed));
+typedef struct ofw_pci_range ofw_pci_range_t;
+
+struct ofw_sbus_reg {
+        uint64_t addr;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_sbus_reg ofw_sbus_reg_t;
+
+struct ofw_sbus_range {
+        uint64_t child_base;
+        uint64_t parent_base;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_sbus_range ofw_sbus_range_t;
+
+struct ofw_upa_reg {
+        uint64_t addr;
+        uint64_t size;
+} __attribute__ ((packed));
+typedef struct ofw_upa_reg ofw_upa_reg_t;
 
 extern void ofw_tree_init(ofw_tree_node_t *);
 extern void ofw_tree_print(void);
-
 extern const char *ofw_tree_node_name(const ofw_tree_node_t *);
 extern ofw_tree_node_t *ofw_tree_lookup(const char *);
 extern ofw_tree_property_t *ofw_tree_getprop(const ofw_tree_node_t *,
     const char *);
-extern void ofw_tree_walk_by_device_type(const char *, ofw_tree_walker_t,
-    void *);
-
 extern ofw_tree_node_t *ofw_tree_find_child(ofw_tree_node_t *, const char *);
 extern ofw_tree_node_t *ofw_tree_find_child_by_device_type(ofw_tree_node_t *,
     const char *);
-
 extern ofw_tree_node_t *ofw_tree_find_peer_by_device_type(ofw_tree_node_t *,
     const char *);
-extern ofw_tree_node_t *ofw_tree_find_peer_by_name(ofw_tree_node_t *,
-    const char *);
+extern ofw_tree_node_t *ofw_tree_find_peer_by_name(ofw_tree_node_t *node,
+    const char *name);
 extern ofw_tree_node_t *ofw_tree_find_node_by_handle(ofw_tree_node_t *,
     uint32_t);
 
+extern bool ofw_fhc_apply_ranges(ofw_tree_node_t *, ofw_fhc_reg_t *,
+    uintptr_t *);
+extern bool ofw_central_apply_ranges(ofw_tree_node_t *, ofw_central_reg_t *,
+    uintptr_t *);
+extern bool ofw_ebus_apply_ranges(ofw_tree_node_t *, ofw_ebus_reg_t *,
+    uintptr_t *);
+extern bool ofw_pci_apply_ranges(ofw_tree_node_t *, ofw_pci_reg_t *,
+    uintptr_t *);
+extern bool ofw_sbus_apply_ranges(ofw_tree_node_t *, ofw_sbus_reg_t *,
+    uintptr_t *);
+extern bool ofw_upa_apply_ranges(ofw_tree_node_t *, ofw_upa_reg_t *,
+    uintptr_t *);
+
+extern bool ofw_pci_reg_absolutize(ofw_tree_node_t *, ofw_pci_reg_t *,
+    ofw_pci_reg_t *);
+
+extern bool ofw_fhc_map_interrupt(ofw_tree_node_t *, ofw_fhc_reg_t *,
+    uint32_t, int *, cir_t *, void **);
+extern bool ofw_ebus_map_interrupt(ofw_tree_node_t *, ofw_ebus_reg_t *,
+    uint32_t, int *, cir_t *, void **);
+extern bool ofw_pci_map_interrupt(ofw_tree_node_t *, ofw_pci_reg_t *,
+    int, int *, cir_t *, void **);
+
 #endif

kernel/genarch/src/drivers/dsrln/dsrlnout.c

@@ -66 +66 @@
         
         outdev_initialize("dsrlnout", &dsrlnout_console, &dsrlnout_ops);
-        stdout_wire(&dsrlnout_console);
+        stdout = &dsrlnout_console;
         
         sysinfo_set_item_val("fb", NULL, true);

kernel/genarch/src/drivers/ega/ega.c

@@ -567 +567 @@
         
         outdev_initialize("ega", &ega_console, &ega_ops);
-        stdout_wire(&ega_console);
+        stdout = &ega_console;
         
         sysinfo_set_item_val("fb", NULL, true);

kernel/genarch/src/fb/fb.c

@@ -458 +458 @@
  *
  */
-bool fb_init(fb_properties_t *props)
-{
-        ASSERT(props);
-        ASSERT(props->x > 0);
-        ASSERT(props->y > 0);
-        ASSERT(props->scan > 0);
-        
+void fb_init(fb_properties_t *props)
+{
         switch (props->visual) {
         case VISUAL_INDIRECT_8:
@@ -511 +506 @@
                 break;
         default:
-                LOG("Unsupported visual.");
-                return false;
+                panic("Unsupported visual.");
         }
         
@@ -542 +536 @@
         size_t glyphsize = FONT_GLYPHS * glyphbytes;
         
+        backbuf = (uint16_t *) malloc(bbsize, 0);
+        if (!backbuf)
+                panic("Unable to allocate backbuffer.");
+        
+        glyphs = (uint8_t *) malloc(glyphsize, 0);
+        if (!glyphs)
+                panic("Unable to allocate glyphs.");
+        
+        bgscan = malloc(bgscanbytes, 0);
+        if (!bgscan)
+                panic("Unable to allocate background pixel.");
+        
+        memsetw(backbuf, cols * rows, 0);
+        
+        glyphs_render();
+        
         fb_addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
-        if (!fb_addr) {
-                LOG("Unable to map framebuffer.");
-                return false;
-        }
-        
-        backbuf = (uint16_t *) malloc(bbsize, 0);
-        if (!backbuf) {
-                LOG("Unable to allocate backbuffer.");
-                return false;
-        }
-        
-        glyphs = (uint8_t *) malloc(glyphsize, 0);
-        if (!glyphs) {
-                free(backbuf);
-                LOG("Unable to allocate glyphs.");
-                return false;
-        }
-        
-        bgscan = malloc(bgscanbytes, 0);
-        if (!bgscan) {
-                free(glyphs);
-                free(backbuf);
-                LOG("Unable to allocate background pixel.");
-                return false;
-        }
-        
-        memsetw(backbuf, cols * rows, 0);
-        glyphs_render();
         
         sysinfo_set_item_val("fb", NULL, true);
@@ -583 +565 @@
         
         outdev_initialize("fb", &fb_console, &fb_ops);
-        stdout_wire(&fb_console);
-        
-        return true;
+        stdout = &fb_console;
 }
 

kernel/genarch/src/ofw/ebus.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/ebus.h>
-#include <genarch/ofw/pci.h>
 #include <arch/memstr.h>
+#include <arch/trap/interrupt.h>
 #include <string.h>
 #include <panic.h>

kernel/genarch/src/ofw/fhc.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/fhc.h>
 #include <arch/drivers/fhc.h>
 #include <arch/memstr.h>

kernel/genarch/src/ofw/ofw_tree.c

@@ -32 +32 @@
 /**
  * @file
- * @brief OpenFirmware device tree navigation.
+ * @brief       OpenFirmware device tree navigation.
  *
  */
@@ -40 +40 @@
 #include <mm/slab.h>
 #include <string.h>
+#include <print.h>
 #include <panic.h>
-#include <print.h>
-
-#define PATH_MAX_LEN  256
-#define NAME_BUF_LEN  50
+
+#define PATH_MAX_LEN    80
+#define NAME_BUF_LEN    50
 
 static ofw_tree_node_t *ofw_root;
@@ -55 +55 @@
 /** Get OpenFirmware node property.
  *
- * @param node Node in which to lookup the property.
- * @param name Name of the property.
- *
- * @return Pointer to the property structure or NULL if no such
- *         property.
- *
- */
-ofw_tree_property_t *ofw_tree_getprop(const ofw_tree_node_t *node,
-    const char *name)
+ * @param node          Node in which to lookup the property.
+ * @param name          Name of the property.
+ *
+ * @return              Pointer to the property structure or NULL if no such
+ *                      property.
+ */
+ofw_tree_property_t *
+ofw_tree_getprop(const ofw_tree_node_t *node, const char *name)
 {
         unsigned int i;
@@ -71 +70 @@
                         return &node->property[i];
         }
-        
+
         return NULL;
 }
@@ -77 +76 @@
 /** Return value of the 'name' property.
  *
- * @param node Node of interest.
- *
- * @return Value of the 'name' property belonging to the node
- *         or NULL if the property is invalid.
- *
+ * @param node          Node of interest.
+ *
+ * @return              Value of the 'name' property belonging to the node.
  */
 const char *ofw_tree_node_name(const ofw_tree_node_t *node)
 {
-        ofw_tree_property_t *prop = ofw_tree_getprop(node, "name");
-        if ((!prop) || (prop->size < 2))
-                return NULL;
+        ofw_tree_property_t *prop;
+        
+        prop = ofw_tree_getprop(node, "name");
+        if (!prop)
+                panic("Node without name property.");
+                
+        if (prop->size < 2)
+                panic("Invalid name property.");
         
         return prop->value;
@@ -94 +96 @@
 /** Lookup child of given name.
  *
- * @param node Node whose child is being looked up.
- * @param name Name of the child being looked up.
- *
- * @return NULL if there is no such child or pointer to the
- *         matching child node.
- *
- */
-ofw_tree_node_t *ofw_tree_find_child(ofw_tree_node_t *node,
-    const char *name)
+ * @param node          Node whose child is being looked up.
+ * @param name          Name of the child being looked up.
+ *
+ * @return              NULL if there is no such child or pointer to the
+ *                      matching child node.
+ */
+ofw_tree_node_t *ofw_tree_find_child(ofw_tree_node_t *node, const char *name)
 {
         ofw_tree_node_t *cur;
@@ -125 +125 @@
                         return cur;
         }
-        
+                
         return NULL;
 }
@@ -131 +131 @@
 /** Lookup first child of given device type.
  *
- * @param node  Node whose child is being looked up.
- * @param dtype Device type of the child being looked up.
- *
- * @return NULL if there is no such child or pointer to the
- *         matching child node.
- *
- */
-ofw_tree_node_t *ofw_tree_find_child_by_device_type(ofw_tree_node_t *node,
-    const char *dtype)
-{
-        ofw_tree_node_t *cur;
+ * @param node          Node whose child is being looked up.
+ * @param name          Device type of the child being looked up.
+ *
+ * @return              NULL if there is no such child or pointer to the
+ *                      matching child node.
+ */
+ofw_tree_node_t *
+ofw_tree_find_child_by_device_type(ofw_tree_node_t *node, const char *name)
+{
+        ofw_tree_node_t *cur;
+        ofw_tree_property_t *prop;
         
         for (cur = node->child; cur; cur = cur->peer) {
-                ofw_tree_property_t *prop =
-                    ofw_tree_getprop(cur, "device_type");
-                
-                if ((!prop) || (!prop->value))
+                prop = ofw_tree_getprop(cur, "device_type");
+                if (!prop || !prop->value)
                         continue;
-                
-                if (str_cmp(prop->value, dtype) == 0)
-                        return cur;
-        }
-        
+                if (str_cmp(prop->value, name) == 0)
+                        return cur;
+        }
+                        
         return NULL;
 }
@@ -162 +159 @@
  * are looked up iteratively to avoid stack overflow.
  *
- * @param root   Root of the searched subtree.
- * @param handle OpenFirmware handle.
- *
- * @return NULL if there is no such node or pointer to the matching
- *         node.
- *
- */
-ofw_tree_node_t *ofw_tree_find_node_by_handle(ofw_tree_node_t *root,
-    uint32_t handle)
-{
-        ofw_tree_node_t *cur;
-        
-        for (cur = root; cur; cur = cur->peer) {
+ * @param root          Root of the searched subtree.
+ * @param handle        OpenFirmware handle.
+ *
+ * @return              NULL if there is no such node or pointer to the matching
+ *                      node.
+ */
+ofw_tree_node_t *
+ofw_tree_find_node_by_handle(ofw_tree_node_t *root, uint32_t handle)
+{
+        ofw_tree_node_t *cur;
+
+        for (cur = root; cur; cur = cur->peer) {                
                 if (cur->node_handle == handle)
                         return cur;
-                
+
                 if (cur->child) {
-                        ofw_tree_node_t *node
-                            = ofw_tree_find_node_by_handle(cur->child, handle);
+                        ofw_tree_node_t *node;
+                        
+                        node = ofw_tree_find_node_by_handle(cur->child, handle);
                         if (node)
                                 return node;
@@ -186 +183 @@
         }
         
-        return NULL;
+        return NULL;    
 }
 
 /** Lookup first peer of given device type.
  *
- * @param node  Node whose peer is being looked up.
- * @param dtype Device type of the child being looked up.
- *
- * @return NULL if there is no such child or pointer to the
- *         matching child node.
- *
- */
-ofw_tree_node_t *ofw_tree_find_peer_by_device_type(ofw_tree_node_t *node,
-    const char *dtype)
-{
-        ofw_tree_node_t *cur;
+ * @param node          Node whose peer is being looked up.
+ * @param name          Device type of the child being looked up.
+ *
+ * @return              NULL if there is no such child or pointer to the
+ *                      matching child node.
+ */
+ofw_tree_node_t *
+ofw_tree_find_peer_by_device_type(ofw_tree_node_t *node, const char *name)
+{
+        ofw_tree_node_t *cur;
+        ofw_tree_property_t *prop;
         
         for (cur = node->peer; cur; cur = cur->peer) {
-                ofw_tree_property_t *prop =
-                    ofw_tree_getprop(cur, "device_type");
-                
-                if ((!prop) || (!prop->value))
+                prop = ofw_tree_getprop(cur, "device_type");
+                if (!prop || !prop->value)
                         continue;
-                
-                if (str_cmp(prop->value, dtype) == 0)
-                        return cur;
-        }
-        
-        return NULL;
-}
+                if (str_cmp(prop->value, name) == 0)
+                        return cur;
+        }
+                        
+        return NULL;
+}
+
 
 /** Lookup first peer of given name.
  *
- * @param node Node whose peer is being looked up.
- * @param name Name of the child being looked up.
- *
- * @return NULL if there is no such peer or pointer to the matching
- *         peer node.
- *
- */
-ofw_tree_node_t *ofw_tree_find_peer_by_name(ofw_tree_node_t *node,
-    const char *name)
-{
-        ofw_tree_node_t *cur;
+ * @param node          Node whose peer is being looked up.
+ * @param name          Name of the child being looked up.
+ *
+ * @return              NULL if there is no such peer or pointer to the matching
+ *                      peer node.
+ */
+ofw_tree_node_t *
+ofw_tree_find_peer_by_name(ofw_tree_node_t *node, const char *name)
+{
+        ofw_tree_node_t *cur;
+        ofw_tree_property_t *prop;
         
         for (cur = node->peer; cur; cur = cur->peer) {
-                ofw_tree_property_t *prop
-                    = ofw_tree_getprop(cur, "name");
-                
-                if ((!prop) || (!prop->value))
+                prop = ofw_tree_getprop(cur, "name");
+                if (!prop || !prop->value)
                         continue;
-                
                 if (str_cmp(prop->value, name) == 0)
                         return cur;
         }
-        
+                        
         return NULL;
 }
@@ -247 +239 @@
 /** Lookup OpenFirmware node by its path.
  *
- * @param path Path to the node.
- *
- * @return NULL if there is no such node or pointer to the leaf
- *         node.
- *
+ * @param path          Path to the node.
+ *
+ * @return              NULL if there is no such node or pointer to the leaf
+ *                      node.
  */
 ofw_tree_node_t *ofw_tree_lookup(const char *path)
 {
-        if (path[0] != '/')
-                return NULL;
-        
+        char buf[NAME_BUF_LEN + 1];
         ofw_tree_node_t *node = ofw_root;
         size_t i;
         size_t j;
+        
+        if (path[0] != '/')
+                return NULL;
         
         for (i = 1; (i < str_size(path)) && (node); i = j + 1) {
@@ -269 +261 @@
                         continue;
                 
-                char buf[NAME_BUF_LEN + 1];
                 memcpy(buf, &path[i], j - i);
                 buf[j - i] = 0;
@@ -278 +269 @@
 }
 
-/** Walk the OpenFirmware device subtree rooted in a node.
+/** Print OpenFirmware device subtree rooted in a node.
  *
  * Child nodes are processed recursively and peer nodes are processed
  * iteratively in order to avoid stack overflow.
  *
- * @param node   Root of the subtree.
- * @param dtype  Device type to look for.
- * @param walker Routine to be invoked on found device.
- * @param arg    User argument to the walker.
- *
- * @return True if the walk should continue.
- *
- */
-static bool ofw_tree_walk_by_device_type_internal(ofw_tree_node_t *node,
-    const char *dtype, ofw_tree_walker_t walker, void *arg)
-{
-        ofw_tree_node_t *cur;
-        
+ * @param node          Root of the subtree.
+ * @param path          Current path, NULL for the very root of the entire tree.
+ */
+static void ofw_tree_node_print(const ofw_tree_node_t *node, const char *path)
+{
+        char *p;
+        const ofw_tree_node_t *cur;
+
+        p = (char *) malloc(PATH_MAX_LEN, 0);
+
         for (cur = node; cur; cur = cur->peer) {
-                ofw_tree_property_t *prop =
-                    ofw_tree_getprop(cur, "device_type");
-                
-                if ((prop) && (prop->value) && (str_cmp(prop->value, dtype) == 0)) {
-                        bool ret = walker(cur, arg);
-                        if (!ret)
-                                return false;
-                }
-                
-                if (cur->child) {
-                        bool ret =
-                            ofw_tree_walk_by_device_type_internal(cur->child, dtype, walker, arg);
-                        if (!ret)
-                                return false;
-                }
-        }
-        
-        return true;
-}
-
-/** Walk the OpenFirmware device tree and find devices by type.
- *
- * Walk the whole OpenFirmware device tree and if any node has
- * the property "device_type" equal to dtype, run a walker on it.
- * If the walker returns false, the walk does not continue.
- *
- * @param dtype  Device type to look for.
- * @param walker Routine to be invoked on found device.
- * @param arg    User argument to the walker.
- *
- */
-void ofw_tree_walk_by_device_type(const char *dtype, ofw_tree_walker_t walker,
-    void *arg)
-{
-        (void) ofw_tree_walk_by_device_type_internal(ofw_root, dtype, walker, arg);
-}
-
-/** Print OpenFirmware device subtree rooted in a node.
- *
- * Child nodes are processed recursively and peer nodes are processed
- * iteratively in order to avoid stack overflow.
- *
- * @param node Root of the subtree.
- * @param path Current path, NULL for the very root of the entire tree.
- *
- */
-static void ofw_tree_node_print(ofw_tree_node_t *node, const char *path)
-{
-        char *cur_path = (char *) malloc(PATH_MAX_LEN, 0);
-        ofw_tree_node_t *cur;
-        
-        for (cur = node; cur; cur = cur->peer) {
-                if ((cur->parent) && (path)) {
-                        snprintf(cur_path, PATH_MAX_LEN, "%s/%s", path, cur->da_name);
-                        printf("%s\n", cur_path);
+                if (cur->parent) {
+                        snprintf(p, PATH_MAX_LEN, "%s/%s", path, cur->da_name);
+                        printf("%s\n", p);
                 } else {
-                        snprintf(cur_path, PATH_MAX_LEN, "%s", cur->da_name);
+                        snprintf(p, PATH_MAX_LEN, "%s", cur->da_name);
                         printf("/\n");
                 }
-                
+
                 if (cur->child)
-                        ofw_tree_node_print(cur->child, cur_path);
-        }
-        
-        free(cur_path);
+                        ofw_tree_node_print(cur->child, p);
+        }
+
+        free(p);
 }
 

kernel/genarch/src/ofw/pci.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/pci.h>
 #include <arch/drivers/pci.h>
 #include <arch/trap/interrupt.h>

kernel/genarch/src/ofw/sbus.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/sbus.h>
 #include <macros.h>
 

kernel/genarch/src/ofw/upa.c

@@ -37 +37 @@
 
 #include <genarch/ofw/ofw_tree.h>
-#include <genarch/ofw/upa.h>
 #include <arch/memstr.h>
 #include <func.h>

kernel/generic/include/console/chardev.h

@@ -36 +36 @@
 #define KERN_CHARDEV_H_
 
-#include <adt/list.h>
 #include <arch/types.h>
 #include <synch/waitq.h>
@@ -76 +75 @@
 } outdev_operations_t;
 
-/** Character output device. */
+/** Character input device. */
 typedef struct outdev {
         char *name;
@@ -82 +81 @@
         /** Protects everything below. */
         SPINLOCK_DECLARE(lock);
-        
-        /** Fields suitable for multiplexing. */
-        link_t link;
-        link_t list;
         
         /** Implementation of outdev operations. */

kernel/generic/include/console/console.h

@@ -44 +44 @@
 
 extern indev_t *stdin_wire(void);
-extern void stdout_wire(outdev_t *outdev);
 extern void console_init(void);
 

kernel/generic/src/console/chardev.c

@@ -33 +33 @@
  */
 
-#include <adt/list.h>
 #include <console/chardev.h>
 #include <synch/waitq.h>
@@ -135 +134 @@
         outdev->name = name;
         spinlock_initialize(&outdev->lock, "outdev");
-        link_initialize(&outdev->link);
-        list_initialize(&outdev->list);
         outdev->op = op;
 }

kernel/generic/src/console/console.c

@@ -76 +76 @@
 static parea_t klog_parea;
 
-static indev_t stdin_sink;
-static outdev_t stdout_source;
-
 static indev_operations_t stdin_ops = {
         .poll = NULL
 };
 
-static void stdout_write(outdev_t *dev, wchar_t ch, bool silent);
-
-static outdev_operations_t stdout_ops = {
-        .write = stdout_write
-};
-
 /** Silence output */
 bool silent = false;
@@ -99 +90 @@
 {
         if (stdin == NULL) {
-                indev_initialize("stdin", &stdin_sink, &stdin_ops);
-                stdin = &stdin_sink;
+                stdin = malloc(sizeof(indev_t), FRAME_ATOMIC);
+                if (stdin != NULL)
+                        indev_initialize("stdin", stdin, &stdin_ops);
         }
         
         return stdin;
-}
-
-void stdout_wire(outdev_t *outdev)
-{
-        if (stdout == NULL) {
-                outdev_initialize("stdout", &stdout_source, &stdout_ops);
-                stdout = &stdout_source;
-        }
-        
-        list_append(&outdev->link, &stdout->list);
-}
-
-static void stdout_write(outdev_t *dev, wchar_t ch, bool silent)
-{
-        link_t *cur;
-        
-        for (cur = dev->list.next; cur != &dev->list; cur = cur->next) {
-                outdev_t *sink = list_get_instance(cur, outdev_t, link);
-                sink->op->write(sink, ch, silent);
-        }
 }