Changeset 38de8a5 in mainline for arch/mips/src/console.c

Timestamp:

2005-09-09T13:50:54Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

b02e5d1

Parents:

b0edf3b2

Message:

MIPS architecture now works without any problems in

• msim: compile as OUTPUT_FORMAT(binary)
• gxemul: compile as OUTPUT_FORMAT(ecoff-littlemips), or create

configuration file for binary format (will be done later)

• simics: compile as OUTPUT_FORMAT(elf32-little), might work with binary

format, didn't try yet.

File:

• arch/mips/src/console.c (moved) (moved from arch/mips/src/putchar.c ) (2 diffs)

arch/mips/src/console.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2003-2004 Jakub Jermar
+ * Copyright (C) 2005 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -30 +30 @@
 #include <arch/types.h>
 #include <arch/cp0.h>
+#include <arch/console.h>
 
-#define VIDEORAM        0xB0000000
+static void (*putchar_func)(const char ch) = NULL;
+
+static void cons_putchar(const char ch)
+{
+        *((char *) VIDEORAM) = ch;
+}
+
+
+static void serial_putchar(const char ch)
+{
+        int i;
+
+        if (ch=='\n')
+                putchar('\r');
+
+        /* Wait until transmit buffer empty */
+        while (! ((*SERIAL_LSR) & (1<<TRANSMIT_EMPTY_BIT)))
+                ;
+        *(SERIAL_PORT_BASE) = ch;
+}
+
+void console_init(void)
+{
+        /* The LSR on the start usually contains this value */
+        if (*SERIAL_LSR == 0x60)
+                putchar_func = serial_putchar;
+        else
+                putchar_func = cons_putchar;
+}
 
 void putchar(const char ch)
 {
-//      __u32 status = cp0_status_read();
-        
-//      cp0_status_write(cp0_status_read() | cp0_status_erl_error_bit);
-        *((char *) VIDEORAM) = ch;
-//      cp0_status_write(status);
+        putchar_func(ch);
 }