Changeset 28ecadb in mainline for boot/arch/sparc64

Timestamp:

2006-09-22T21:44:54Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d684e4

Parents:

16529d5

Message:

Convert sparc64 to detect keyboard and determine
its physical address by walking the memory representation
of the OpenFirmware device tree.

Add bus-specific functions that know how to apply the
"ranges" property to one component of the "reg" property.
Buses supported so far include FHC, EBUS and PCI.

Location:

boot/arch/sparc64/loader

Files:

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

boot/arch/sparc64/loader/main.c

@@ -66 +66 @@
         bootinfo.screen.scanline = bootinfo.screen.scanline*bpp2align[bootinfo.screen.bpp >> 3];
         
-        if (!ofw_keyboard(&bootinfo.keyboard))
-                printf("Error: unable to get keyboard properties\n");
-
         if (!ofw_cpu(&bootinfo.cpu))
                 printf("Error: unable to get cpu properties\n");
@@ -76 +73 @@
         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(" keyboard at %P (size %d bytes)\n", (uintptr_t) bootinfo.keyboard.addr, bootinfo.keyboard.size);
 
         printf("\nMemory statistics\n");

boot/arch/sparc64/loader/main.h

@@ -55 +55 @@
         memmap_t memmap;
         screen_t screen;
-        keyboard_t keyboard;
         cpu_t cpu;
         ballocs_t ballocs;

boot/arch/sparc64/loader/ofwarch.c

@@ -96 +96 @@
         for (; node != 0 && node != -1; node = ofw_get_peer_node(node)) {
                 if (ofw_get_property(node, "device_type", type_name, sizeof(type_name)) > 0) {
-                        if (strncmp(type_name, "cpu", 3) == 0) {
+                        if (strcmp(type_name, "cpu") == 0) {
                                 uint32_t mhz;