Changeset 7dcde32 in mainline

Timestamp:

2006-03-24T18:29:04Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c6143b4

Parents:

f941347

Message:

extend boot info

Location:

arch/ppc32/loader

Files:

• main.c (modified) (3 diffs)
• ofw.c (modified) (4 diffs)
• ofw.h (modified) (2 diffs)

arch/ppc32/loader/main.c

@@ -37 +37 @@
 #define HEAP_GAP 1024000
 
-memmap_t memmap;
+typedef struct {
+        memmap_t memmap;
+        screen_t screen;
+} bootinfo_t;
+
+bootinfo_t bootinfo;
 
 
@@ -83 +88 @@
         check_align(&trans, "Translation table");
         
-        if (!ofw_memmap(&memmap)) {
+        if (!ofw_memmap(&bootinfo.memmap)) {
                 printf("Error: Unable to get memory map\n");
                 halt();
         }
         
+        if (!ofw_screen(&bootinfo.screen)) {
+                printf("Error: Unable to get screen properties\n");
+                halt();
+        }
+        
+        printf("\nDevice statistics\n");
+        printf(" screen at %L, resolution %dx%d, %d bpp (scanline %d bytes)\n", bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
+        
         void *real_mode_pa = ofw_translate(&real_mode);
         void *trans_pa = ofw_translate(&trans);
-        void *memmap_pa = ofw_translate(&memmap);
+        void *bootinfo_pa = ofw_translate(&bootinfo);
         
-        printf("Memory statistics (total %d MB)\n", memmap.total >> 20);
+        printf("\nMemory statistics (total %d MB)\n", bootinfo.memmap.total >> 20);
         printf(" kernel image         at %L (size %d bytes)\n", KERNEL_START, KERNEL_SIZE);
-        printf(" memory map           at %L (physical %L)\n", &memmap, memmap_pa);
+        printf(" boot info            at %L (physical %L)\n", &bootinfo, bootinfo_pa);
         printf(" bootstrap trampoline at %L (physical %L)\n", &real_mode, real_mode_pa);
         printf(" translation table    at %L (physical %L)\n", &trans, trans_pa);
@@ -108 +121 @@
         fix_overlap(&real_mode, &real_mode_pa, "Bootstrap trampoline", &top);
         fix_overlap(&trans, &trans_pa, "Translation table", &top);
-        fix_overlap(&memmap, &memmap_pa, "Memory map", &top);
+        fix_overlap(&bootinfo, &bootinfo_pa, "Boot info", &top);
         
-        printf("Booting the kernel...\n");
-        jump_to_kernel(memmap_pa, trans_pa, KERNEL_SIZE, real_mode_pa);
+        printf("\nBooting the kernel...\n");
+        jump_to_kernel(bootinfo_pa, trans_pa, KERNEL_SIZE, real_mode_pa);
 }

arch/ppc32/loader/ofw.c

@@ -32 +32 @@
 
 #define MAX_OFW_ARGS    10
+#define STRING_SIZE             1024
 
 typedef unsigned int ofw_arg_t;
@@ -53 +54 @@
 
 phandle ofw_chosen;
+phandle ofw_aliases;
 ihandle ofw_mmu;
 ihandle ofw_stdout;
@@ -107 +109 @@
                 ofw_stdout = 0;
         
+        ofw_aliases = ofw_find_device("/aliases");
+        if (ofw_aliases == -1) {
+                puts("\nUnable to find /aliases device\n");
+                halt();
+        }
+        
         ofw_mmu = ofw_open("/mmu");
         if (ofw_mmu == -1) {
-                puts("Unable to open /mmu node\n");
+                puts("\nUnable to open /mmu node\n");
                 halt();
         }
@@ -158 +166 @@
         }
 }
+
+
+int ofw_screen(screen_t *screen)
+{
+        char device_name[STRING_SIZE];
+        
+        if (ofw_get_property(ofw_aliases, "screen", device_name, STRING_SIZE) <= 0)
+                return false;
+        
+        phandle device = ofw_find_device(device_name);
+        if (device == -1)
+                return false;
+        
+        if (ofw_get_property(device, "address", &screen->addr, sizeof(screen->addr)) <= 0)
+                return false;
+        
+        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;
+}

arch/ppc32/loader/ofw.h

@@ -52 +52 @@
 } memmap_t;
 
+typedef struct {
+        unsigned int addr;
+        unsigned int width;
+        unsigned int height;
+        unsigned int bpp;
+        unsigned int scanline;
+} screen_t;
+
 
 extern void init(void);
@@ -59 +67 @@
 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);
 
 #endif