Changeset 25a76ab8 in mainline for boot/arch/ppc32/src/ofw.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/ppc32/src/ofw.c (moved) (moved from boot/arch/ppc32/loader/ofwarch.c ) (1 diff)

boot/arch/ppc32/src/ofw.c

@@ -27 +27 @@
  */
 
-#include <ofwarch.h>
-#include <ofw.h>
-#include <printf.h>
+#include <genarch/ofw.h>
+#include <typedefs.h>
+#include <putchar.h>
+#include <str.h>
 
 typedef int (*ofw_entry_t)(ofw_args_t *args);
 
-int ofw(ofw_args_t *args)
+ofw_arg_t ofw(ofw_args_t *args)
 {
         return ((ofw_entry_t) ofw_cif)(args);
 }
 
-void write(const char *str, const int len)
+void putchar(const wchar_t ch)
 {
-        int i;
+        if (ch == '\n')
+                ofw_putchar('\r');
         
-        for (i = 0; i < len; i++) {
-                if (str[i] == '\n')
-                        ofw_write("\r", 1);
-                ofw_write(&str[i], 1);
-        }
+        if (ascii_check(ch))
+                ofw_putchar(ch);
+        else
+                ofw_putchar(U_SPECIAL);
 }
-
-int ofw_translate_failed(ofw_arg_t flag)
-{
-        /* PearPC returns buggy flag */
-        return 0;
-}