Changeset c34f98f in mainline

Timestamp:

2006-06-06T17:09:10Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9d371cb

Parents:

9fa072dc

Message:

update boot loader API

Location:

arch/ppc32/loader

Files:

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

arch/ppc32/loader/main.c

@@ -101 +101 @@
         }
         
+        if (!ofw_keyboard(&bootinfo.keyboard)) {
+                printf("Error: unable to get keyboard properties, halting.\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);
+        printf(" keyboard at %L (size %d bytes)\n", bootinfo.keyboard.addr, bootinfo.keyboard.size);
         
         void *real_mode_pa = ofw_translate(&real_mode);

arch/ppc32/loader/main.h

@@ -55 +55 @@
         memmap_t memmap;
         screen_t screen;
+        keyboard_t keyboard;
 } bootinfo_t;
 

arch/ppc32/loader/ofw.c

@@ -246 +246 @@
         return true;
 }
+
+
+int ofw_keyboard(keyboard_t *keyboard)
+{
+        char device_name[BUF_SIZE];
+        
+        if (ofw_get_property(ofw_aliases, "macio", device_name, sizeof(char) * BUF_SIZE) <= 0)
+                return false;
+        
+        phandle device = ofw_find_device(device_name);
+        if (device == -1)
+                return false;
+        
+        // FIXME
+        keyboard->addr = (void *) 0x80816000;
+        keyboard->size = 7680;
+        
+        return true;
+}

arch/ppc32/loader/ofw.h

@@ -60 +60 @@
 } screen_t;
 
+typedef struct {
+        void *addr;
+        unsigned int size;
+} keyboard_t;
+
 
 extern void init(void);
@@ -68 +73 @@
 extern int ofw_memmap(memmap_t *map);
 extern int ofw_screen(screen_t *screen);
+extern int ofw_keyboard(keyboard_t *keyboard);
 
 #endif