Changeset f817d3a in mainline for boot

Timestamp:

2009-01-29T17:24:35Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

43d6401

Parents:

26c67a8

Message:

use macio optionally

Location:

boot

Files:

• arch/ppc32/loader/main.c (modified) (2 diffs)
• arch/ppc32/loader/main.h (modified) (1 diff)
• arch/ppc32/loader/ofwarch.c (modified) (2 diffs)
• genarch/ofw.h (modified) (2 diffs)

boot/arch/ppc32/loader/main.c

@@ -90 +90 @@
 static void version_print(void)
 {
-        printf("HelenOS PPC32 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n", release, revision, timestamp);
+        printf("HelenOS PPC32 Bootloader\nRelease %s%s%s\nCopyright (c) 2006 HelenOS project\n\n", release, revision, timestamp);
 }
 
@@ -108 +108 @@
         
         if (!ofw_memmap(&bootinfo.memmap)) {
-                printf("Error: unable to get memory map, halting.\n");
+                printf("Error: Unable to get memory map, halting.\n");
                 halt();
         }
         
         if (bootinfo.memmap.total == 0) {
-                printf("Error: no memory detected, halting.\n");
+                printf("Error: No memory detected, halting.\n");
                 halt();
         }
         
         if (!ofw_screen(&bootinfo.screen))
-                printf("Warning: unable to get screen properties.\n");
+                printf("Warning: Unable to get screen properties.\n");
         
-        if (!ofw_keyboard(&bootinfo.keyboard))
-                printf("Warning: unable to get keyboard properties.\n");
+        if (!ofw_macio(&bootinfo.macio))
+                printf("Warning: Unable to get macio properties.\n");
         
-        printf("\nDevice statistics\n");
-        printf(" screen at %L, resolution %dx%d, %d bpp (scanline %d bytes)\n", bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
-        printf(" keyboard at %L (size %d bytes)\n", bootinfo.keyboard.addr, bootinfo.keyboard.size);
+        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);

boot/arch/ppc32/loader/main.h

@@ -48 +48 @@
         taskmap_t taskmap;
         screen_t screen;
-        keyboard_t keyboard;
+        macio_t macio;
 } bootinfo_t;
 

boot/arch/ppc32/loader/ofwarch.c

@@ -49 +49 @@
 }
 
-int ofw_keyboard(keyboard_t *keyboard)
+int ofw_macio(macio_t *macio)
 {
         char device_name[BUF_SIZE];
@@ -55 +55 @@
         if (ofw_get_property(ofw_aliases, "macio", device_name, sizeof(device_name)) <= 0)
                 return false;
-                                
+        
         phandle device = ofw_find_device(device_name);
         if (device == -1)
                 return false;
-                                                                
-        pci_reg_t macio;
-        if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0)
+        
+        pci_reg_t pci_reg;
+        if (ofw_get_property(device, "assigned-addresses", &pci_reg, sizeof(pci_reg)) <= 0)
                 return false;
-        keyboard->addr = (void *) macio.addr.addr_lo;
-        keyboard->size = macio.size_lo;
+        
+        macio->addr = (void *) pci_reg.addr.addr_lo;
+        macio->size = pci_reg.size_lo;
 
         return true;

boot/genarch/ofw.h

@@ -75 +75 @@
         void *addr;
         uint32_t size;
-} keyboard_t;
+} macio_t;
 
 typedef struct {
@@ -123 +123 @@
 extern int ofw_memmap(memmap_t *map);
 extern int ofw_screen(screen_t *screen);
-extern int ofw_keyboard(keyboard_t *keyboard);
+extern int ofw_macio(macio_t *macio);
 extern int setup_palette(void);
 extern void ofw_quiesce(void);