Changeset 5d684e4 in mainline for boot

Timestamp:

2006-09-23T13:12:10Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6ff1f1e

Parents:

28ecadb

Message:

Convert sparc64 framebuffer code to configure from the OpenFirmware device tree memory representation.

Location:

boot/arch/sparc64/loader

Files:

• main.c (modified) (1 diff)
• main.h (modified) (1 diff)
• ofwarch.c (modified) (2 diffs)

boot/arch/sparc64/loader/main.c

@@ -58 +58 @@
         }
         
-        if (!ofw_screen(&bootinfo.screen)) {
-                printf("Error: unable to get screen properties, halting.\n");
-                halt();
-        }
-        bootinfo.screen.addr = ofw_translate(bootinfo.screen.addr);
-        /* transform scanline to bytes with respect to potential alignment */
-        bootinfo.screen.scanline = bootinfo.screen.scanline*bpp2align[bootinfo.screen.bpp >> 3];
-        
         if (!ofw_cpu(&bootinfo.cpu))
                 printf("Error: unable to get cpu properties\n");
 
-        printf("\nDevice statistics\n");
+        printf("\nDevice info\n");
         printf(" cpu: %dMHz\n", bootinfo.cpu.clock_frequency/1000000);
         printf(" memory: %dM\n", bootinfo.memmap.total>>20);
-        printf(" screen at %P, resolution %dx%d, %d bpp (scanline %d bytes)\n", (uintptr_t) bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
 
         printf("\nMemory statistics\n");

boot/arch/sparc64/loader/main.h

@@ -54 +54 @@
         taskmap_t taskmap;
         memmap_t memmap;
-        screen_t screen;
         cpu_t cpu;
         ballocs_t ballocs;

boot/arch/sparc64/loader/ofwarch.c

@@ -38 +38 @@
 #include "main.h"
 
-int bpp2align[] = {
-        [0] = 0,                /** Invalid bpp. */
-        [1] = 1,                /** 8bpp is not aligned. */
-        [2] = 2,                /** 16bpp is naturally aligned. */
-        [3] = 4,                /** 24bpp is aligned on 4 byte boundary. */
-        [4] = 4,                /** 32bpp is naturally aligned. */
-};
-
 void write(const char *str, const int len)
 {
@@ -60 +52 @@
 {
         return flag != -1;
-}
-
-int ofw_keyboard(keyboard_t *keyboard)
-{
-        char device_name[BUF_SIZE];
-        uint32_t virtaddr;
-                
-        if (ofw_get_property(ofw_aliases, "keyboard", 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;
-                                                                                                
-        if (!(keyboard->addr = ofw_translate((void *) ((uintptr_t) virtaddr))))
-                return false;
-
-        return true;
 }