Changeset a4f959b in mainline

Timestamp:

2012-12-14T00:02:30Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7633928c

Parents:

14febed9

Message:

Use the YAMON print_count subroutine to implement putchar.

Location:

boot/arch/mips32

Files:

• include/arch.h (modified) (1 diff)
• src/putchar.c (modified) (2 diffs)

boot/arch/mips32/include/arch.h

@@ -51 +51 @@
 #define LOADER_OFFSET    0x00103000
 
-#define MALTA_SERIAL     0xb80003f8
+#define YAMON_SUBR_BASE         PA2KA(0x1fc00500)
+#define YAMON_SUBR_PRINT_COUNT  (YAMON_SUBR_BASE + 0x4)
 #endif
 

boot/arch/mips32/src/putchar.c

@@ -37 +37 @@
 
 #if defined(MACHINE_msim)
-#define PUTCHAR_ADDRESS MSIM_VIDEORAM_ADDRESS
+#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_ADDRESS MALTA_SERIAL
+#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
 
@@ -47 +61 @@
 {
         if (ascii_check(ch))
-                *((char *) PUTCHAR_ADDRESS) = ch;
+                _putchar(ch);
         else
-                *((char *) PUTCHAR_ADDRESS) = U_SPECIAL;
+                _putchar(U_SPECIAL);
 }