Changeset 6323989 in mainline for arch/ppc32/loader/ofw.c

Timestamp:

2006-03-14T09:11:07Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2d69ee6

Parents:

eebd172

Message:

ofw code cleanup
get memory map from ofw

File:

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

arch/ppc32/loader/ofw.c

@@ -30 +30 @@
 #include "printf.h"
 
+#define MAX_OFW_ARGS    10
+
+typedef unsigned int ofw_arg_t;
+typedef unsigned int ihandle;
+typedef unsigned int phandle;
+
+/** OpenFirmware command structure
+ *
+ */
+typedef struct {
+        const char *service;          /**< Command name */
+        unsigned int nargs;           /**< Number of in arguments */
+        unsigned int nret;            /**< Number of out arguments */
+        ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments */
+} ofw_args_t;
+
+typedef void (*ofw_entry)(ofw_args_t *);
+
+
 ofw_entry ofw;
 
@@ -37 +56 @@
 
 
-void init(void)
-{
-        ofw_chosen = ofw_find_device("/chosen");
-        if (ofw_chosen == -1)
-                halt();
-        
-        if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)      
-                ofw_stdout = 0;
-        
-        ofw_mmu = ofw_open("/mmu");
-        if (ofw_mmu == -1) {
-                puts("Unable to open /mmu node\n");
-                halt();
-        }
-}
-
-void halt(void)
-{
-        ofw_call("exit", 0, 0);
-}
-
-
-int ofw_call(const char *service, const int nargs, const int nret, ...)
+static int ofw_call(const char *service, const int nargs, const int nret, ...)
 {
         va_list list;
@@ -83 +80 @@
 
 
-ihandle ofw_open(const char *name)
+static phandle ofw_find_device(const char *name)
+{
+        return ofw_call("finddevice", 1, 1, name);
+}
+
+
+static int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen)
+{
+        return ofw_call("getprop", 4, 1, device, name, buf, buflen);
+}
+
+static ihandle ofw_open(const char *name)
 {
         return ofw_call("open", 1, 1, name);
+}
+
+
+void init(void)
+{
+        ofw_chosen = ofw_find_device("/chosen");
+        if (ofw_chosen == -1)
+                halt();
+        
+        if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)      
+                ofw_stdout = 0;
+        
+        ofw_mmu = ofw_open("/mmu");
+        if (ofw_mmu == -1) {
+                puts("Unable to open /mmu node\n");
+                halt();
+        }
+}
+
+
+void halt(void)
+{
+        ofw_call("exit", 0, 0);
 }
 
@@ -95 +126 @@
         
         ofw_call("write", 3, 1, ofw_stdout, str, len);
-}
-
-
-phandle ofw_find_device(const char *name)
-{
-        return ofw_call("finddevice", 1, 1, name);
-}
-
-
-int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen)
-{
-        return ofw_call("getprop", 4, 1, device, name, buf, buflen);
 }
 
@@ -120 +139 @@
         return ofw_call("call-method", 6, 1, "map", ofw_mmu, mode, size, virt, phys);
 }
+
+
+int ofw_memmap(memmap_t *map)
+{
+        int i;
+        int ret;
+
+        phandle handle = ofw_find_device("/memory");
+        if (handle == -1)
+                return false;
+        
+        ret = ofw_get_property(handle, "reg", &map->zones, sizeof(map->zones));
+        if (ret == -1)
+                return false;
+        
+        map->total = 0;
+        map->count = 0;
+        for (i = 0; i < MEMMAP_MAX_RECORDS; i++) {
+                if (map->zones[i].size == 0)
+                        break;
+                map->count++;
+                map->total += map->zones[i].size;
+        }
+}