Changeset 0ffa3ef5 in mainline for genarch/src/ofw/ofw.c

Timestamp:

2006-07-10T20:57:30Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

11675207

Parents:

7f1c620

Message:

Sync OpenFirmware functionality with boot.
Random cleanup.

File:

• genarch/src/ofw/ofw.c (modified) (5 diffs)

genarch/src/ofw/ofw.c

@@ -39 +39 @@
 #include <arch/types.h>
 
-ofw_entry ofw;
+uintptr_t ofw_cif;      /**< OpenFirmware Client Interface address. */
 
 phandle ofw_chosen;
-ihandle ofw_stdin;
 ihandle ofw_stdout;
+ihandle ofw_mmu;
 
 void ofw_init(void)
@@ -51 +51 @@
                 ofw_done();
         
-        if (ofw_get_property(ofw_chosen, "stdin",  &ofw_stdin, sizeof(ofw_stdin)) <= 0)
-                ofw_stdin = 0;
-                
         if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)
                 ofw_stdout = 0; 
+
+        if (ofw_get_property(ofw_chosen, "mmu",  &ofw_mmu, sizeof(ofw_mmu)) <= 0)
+                ofw_mmu = 0;
 }
 
 void ofw_done(void)
 {
-        (void) ofw_call("exit", 0, 0);
+        (void) ofw_call("exit", 0, 1, NULL);
         cpu_halt();
 }
 
-unative_t ofw_call(const char *service, const int nargs, const int nret, ...)
+/** Perform a call to OpenFirmware client interface.
+ *
+ * @param service String identifying the service requested.
+ * @param nargs Number of input arguments.
+ * @param nret Number of output arguments. This includes the return value.
+ * @param rets Buffer for output arguments or NULL. The buffer must accomodate nret - 1 items.
+ *
+ * @return Return value returned by the client interface.
+ */
+ofw_arg_t ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...)
 {
         va_list list;
@@ -74 +83 @@
         args.nret = nret;
         
-        va_start(list, nret);
+        va_start(list, rets);
         for (i = 0; i < nargs; i++)
                 args.args[i] = va_arg(list, ofw_arg_t);
@@ -82 +91 @@
                 args.args[i + nargs] = 0;
         
-        ofw(&args);
-        
+        (void) ofw(&args);
+
+        for (i = 1; i < nret; i++)
+                rets[i - 1] = args.args[i + nargs];
+
         return args.args[nargs];
 }
@@ -92 +104 @@
                 return;
         
-        (void) ofw_call("write", 3, 1, ofw_stdout, &ch, 1);
-}
-
-/** Read character from OFW's input.
- *
- * This call is non-blocking.
- *
- * @return 0 if no character was read, character read otherwise.
- */
-char ofw_getchar(void)
-{
-        char ch;
-
-        if (ofw_stdin == 0)
-                return 0;
-        
-        if (ofw_call("read", 3, 1, ofw_stdin, &ch, 1) == 1)
-                return ch;
-        else
-                return 0;
+        (void) ofw_call("write", 3, 1, NULL, ofw_stdout, &ch, 1);
 }
 
 phandle ofw_find_device(const char *name)
 {
-        return (phandle) ofw_call("finddevice", 1, 1, name);
+        return (phandle) ofw_call("finddevice", 1, 1, NULL, name);
 }
 
-int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen)
+int ofw_get_property(const phandle device, const char *name, const void *buf, const int buflen)
 {
-        return (int) ofw_call("getprop", 4, 1, device, name, buf, buflen);
+        return (int) ofw_call("getprop", 4, 1, NULL, device, name, buf, buflen);
+}
+
+/** Translate virtual address to physical address using OpenFirmware.
+ *
+ * Use this function only when OpenFirmware is in charge.
+ *
+ * @param virt Virtual address.
+ * @return NULL on failure or physical address on success.
+ */
+void *ofw_translate(const void *virt)
+{
+        ofw_arg_t result[4];
+        int shift;
+        
+        if (!ofw_mmu)
+                return NULL;
+        
+        if (ofw_call("call-method", 3, 5, result, "translate", ofw_mmu, virt) != 0)
+                return NULL;
+
+        if (result[0] != -1)
+                return NULL;
+                                                                
+        if (sizeof(unative_t) == 8)
+                shift = 32;
+        else
+                shift = 0;
+        
+        return (void *) ((result[2]<<shift)|result[3]);
 }
 
 void *ofw_claim(const void *addr, const int size, const int align)
 {
-        return (void *) ofw_call("claim", 3, 1, addr, size, align);
+        return (void *) ofw_call("claim", 3, 1, NULL, addr, size, align);
 }