Changeset 119b46e in mainline for boot/arch/mips32/src/putchar.c

Timestamp:

2013-03-22T17:25:04Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

59fb782, 8f9d70b, b183ce0a

Parents:

fa33ac4 (diff), 8fe2c9bd (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 from lp:~jakub/helenos/mips-malta.

File:

• boot/arch/mips32/src/putchar.c (modified) (1 diff)

boot/arch/mips32/src/putchar.c

@@ -32 +32 @@
 #include <str.h>
 
+#ifdef PUTCHAR_ADDRESS
+#undef PUTCHAR_ADDRESS
+#endif
+
+#if defined(MACHINE_msim)
+#define _putchar(ch)    msim_putchar((ch))
+static void msim_putchar(const wchar_t ch)
+{
+        *((char *) MSIM_VIDEORAM_ADDRESS) = ch;
+}
+#endif
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+#define _putchar(ch)    yamon_putchar((ch))
+typedef void (**yamon_print_count_ptr_t)(uint32_t, const char *, uint32_t);
+yamon_print_count_ptr_t yamon_print_count =
+    (yamon_print_count_ptr_t) YAMON_SUBR_PRINT_COUNT;
+
+static void yamon_putchar(const wchar_t wch)
+{
+        const char ch = (char) wch;
+
+        (*yamon_print_count)(0, &ch, 1);
+}
+#endif
+
 void putchar(const wchar_t ch)
 {
         if (ascii_check(ch))
-                *((char *) MSIM_VIDEORAM_ADDRESS) = ch;
+                _putchar(ch);
         else
-                *((char *) MSIM_VIDEORAM_ADDRESS) = U_SPECIAL;
+                _putchar(U_SPECIAL);
 }
+