Changeset 93b84b3 in mainline for arch/mips32

Timestamp:

2005-12-12T16:30:07Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ebbdb8f

Parents:

af9a7c5

Message:

Fixed weird simics panic.
Run kconsole, if we panic. This currently works in gxemul,
simics. In mips we need to modify the simulator.
On ia32 we need a function, that would speak directly to the chip
and fetch the character using polling.

Location:

arch/mips32/src

Files:

• drivers/msim.c (modified) (2 diffs)
• drivers/serial.c (modified) (2 diffs)
• panic.S (modified) (1 diff)

arch/mips32/src/drivers/msim.c

@@ -38 +38 @@
 static void msim_enable(chardev_t *dev);
 static void msim_disable(chardev_t *dev);
+static char msim_do_read(chardev_t *dev);
 
 static chardev_operations_t msim_ops = {
         .resume = msim_enable,
         .suspend = msim_disable,
-        .write = msim_write
+        .write = msim_write,
+        .read = msim_do_read,
 };
 
@@ -64 +66 @@
 
 #include <print.h>
+/** Read character using polling, assume interrupts disabled */
+static char msim_do_read(chardev_t *dev)
+{
+        char ch;
+
+        while (1) {
+                ch = *((volatile char *) MSIM_KBD_ADDRESS);
+                if (ch) {
+                        if (ch == '\r')
+                                return '\n';
+                        if (ch == 0x7f)
+                                return '\b';
+                        return ch;
+                }
+        }
+}
+
 /** Process keyboard interrupt. */
 static void msim_interrupt(int n, void *stack)
 {
-        char ch;
+        char ch = 0;
 
         ch = *((char *) MSIM_KBD_ADDRESS);

arch/mips32/src/drivers/serial.c

@@ -72 +72 @@
 }
 
-static chardev_operations_t serial_ops = {
-        .resume = serial_enable,
-        .suspend = serial_disable,
-        .write = serial_write
-};
+/** Read character from serial port, wait until available */
+static char serial_do_read(chardev_t *dev)
+{
+        serial_t *sd = (serial_t *)dev->data;
+        char ch;
+
+        while (!(SERIAL_READ_LSR(sd->port) & 1))
+                ;
+        ch = SERIAL_READ(sd->port);
+
+        if (ch =='\r')
+                ch = '\n';
+        return ch;
+}
+
 
 /** Process keyboard interrupt. Does not work in simics? */
@@ -93 +103 @@
 }
 
+
+
+static chardev_operations_t serial_ops = {
+        .resume = serial_enable,
+        .suspend = serial_disable,
+        .write = serial_write,
+        .read = serial_do_read
+};
 
 iroutine old_timer;

arch/mips32/src/panic.S

@@ -39 +39 @@
 /* From printf return directly to halt() */     
 panic_printf:
-        lui $ra, %hi(halt)
+        jal printf
+        nop
+        j halt
+        nop
+/* This code does not work, god knows why */            
+/*      lui $ra, %hi(halt)
         j printf
-        ori $ra, %lo(halt)
+        ori $ra, %lo(halt) */