Changeset b7b5f83 in mainline for genarch/ofw.c

Timestamp:

2006-07-03T19:46:13Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b95b717

Parents:

d22645e

Message:

Cleanup OpenFirmware driver and prepare it for integration with sparc64 bootloader.
Start sparc64 boot loader (now inactive and unfunctional).

File:

• genarch/ofw.c (modified) (8 diffs)

genarch/ofw.c

@@ -32 +32 @@
 
 #define MAX_OFW_ARGS            10
-#define BUF_SIZE                1024
-
-typedef unsigned int ofw_arg_t;
-typedef unsigned int ihandle;
-typedef unsigned int phandle;
 
 /** OpenFirmware command structure
@@ -50 +45 @@
 typedef void (*ofw_entry)(ofw_args_t *);
 
-
-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;
 
@@ -100 +81 @@
 
 
-static phandle ofw_find_device(const char *name)
+phandle ofw_find_device(const char *name)
 {
         return ofw_call("finddevice", 1, 1, NULL, name);
@@ -106 +87 @@
 
 
-static int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen)
+int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen)
 {
         return ofw_call("getprop", 4, 1, NULL, device, name, buf, buflen);
@@ -205 +186 @@
 int ofw_memmap(memmap_t *map)
 {
-        unsigned int buf[BUF_SIZE];
-        int ret = ofw_get_property(ofw_memory, "reg", buf, sizeof(unsigned int) * BUF_SIZE);
+        unsigned long buf[BUF_SIZE];
+        int ret = ofw_get_property(ofw_memory, "reg", buf, sizeof(buf));
         if (ret <= 0)
                 return false;
@@ -216 +197 @@
         map->total = 0;
         map->count = 0;
-        for (pos = 0; (pos < ret / sizeof(unsigned int)) && (map->count < MEMMAP_MAX_RECORDS); pos += ac + sc) {
+        for (pos = 0; (pos < ret / sizeof(unsigned long)) && (map->count < MEMMAP_MAX_RECORDS); pos += ac + sc) {
                 void * start = (void *) buf[pos + ac - 1];
                 unsigned int size = buf[pos + ac + sc - 1];
@@ -234 +215 @@
         char device_name[BUF_SIZE];
         
-        if (ofw_get_property(ofw_aliases, "screen", device_name, sizeof(char) * BUF_SIZE) <= 0)
+        if (ofw_get_property(ofw_aliases, "screen", device_name, sizeof(device_name)) <= 0)
                 return false;
         
@@ -259 +240 @@
 }
 
-
-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;
-        
-        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;
-}