Changeset 7431e867 in mainline

Timestamp:

2006-06-20T12:03:12Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

282f4724

Parents:

9334b93

Message:

read macio address from PCI OFW entry

File:

• arch/ppc32/loader/ofw.c (modified) (2 diffs)

arch/ppc32/loader/ofw.c

@@ -51 +51 @@
 
 
+typedef struct {
+        unsigned int info;
+        unsigned int addr_hi;
+    unsigned int addr_lo;
+} pci_addr_t;
+
+typedef struct {
+        pci_addr_t addr;
+    unsigned int size_hi;
+    unsigned int size_lo;
+} pci_reg_t;
+
+
 ofw_entry ofw;
 
@@ -259 +272 @@
                 return false;
         
-        // FIXME
-        keyboard->addr = (void *) 0x80816000;
-        keyboard->size = 7680;
+        pci_reg_t macio;
+        if (ofw_get_property(device, "assigned-addresses", &macio, sizeof(macio)) <= 0)
+                return false;
+        
+        keyboard->addr = (void *) macio.addr.addr_lo;
+        keyboard->size = macio.size_lo;
         
         return true;