Changeset 516ff92 in mainline for kernel/arch/mips32

Timestamp:

2009-01-31T21:27:18Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

4863e50b

Parents:

96a2e45

Message:

silent kernel console output when user space console is active

Location:

kernel/arch/mips32/src/drivers

Files:

• msim.c (modified) (4 diffs)
• serial.c (modified) (4 diffs)

kernel/arch/mips32/src/drivers/msim.c

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup mips32
  * @{
  */
@@ -59 +59 @@
 
 /** Putchar that works with MSIM & gxemul */
-void msim_write(chardev_t *dev, const char ch)
+void msim_write(chardev_t *dev, const char ch, bool silent)
 {
-        *((char *) MSIM_VIDEORAM) = ch;
+        if (!silent)
+                *((char *) MSIM_VIDEORAM) = ch;
 }
 
@@ -81 +82 @@
 {
         char ch;
-
+        
         while (1) {
                 ch = *((volatile char *) MSIM_KBD_ADDRESS);
@@ -102 +103 @@
                 char ch = 0;
                 
-                        ch = *((char *) MSIM_KBD_ADDRESS);
-                        if (ch =='\r')
-                                ch = '\n';
-                        if (ch == 0x7f)
-                                ch = '\b';
-                        chardev_push_character(&console, ch);
+                ch = *((char *) MSIM_KBD_ADDRESS);
+                if (ch =='\r')
+                        ch = '\n';
+                if (ch == 0x7f)
+                        ch = '\b';
+                chardev_push_character(&console, ch);
         }
 }

kernel/arch/mips32/src/drivers/serial.c

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup mips32
  * @{
  */
@@ -47 +47 @@
 static bool kb_enabled;
 
-static void serial_write(chardev_t *d, const char ch)
+static void serial_write(chardev_t *d, const char ch, bool silent)
 {
-        serial_t *sd = (serial_t *)d->data;
-
-        if (ch == '\n')
-                serial_write(d, '\r');
-        /* Wait until transmit buffer empty */
-        while (! (SERIAL_READ_LSR(sd->port) & (1<<TRANSMIT_EMPTY_BIT)))
-                ;
-        SERIAL_WRITE(sd->port, ch);
+        if (!silent) {
+                serial_t *sd = (serial_t *)d->data;
+                
+                if (ch == '\n')
+                        serial_write(d, '\r');
+                
+                /* Wait until transmit buffer empty */
+                while (!(SERIAL_READ_LSR(sd->port) & (1 << TRANSMIT_EMPTY_BIT)));
+                SERIAL_WRITE(sd->port, ch);
+        }
 }
 
@@ -134 +136 @@
 {
         serial_t *sd = &sconf[0];
-
-
+        
         chardev_initialize("serial_console", &console, &serial_ops);
         console.data = sd;
@@ -146 +147 @@
         serial_irq.handler = serial_irq_handler;
         irq_register(&serial_irq);
-
+        
         /* I don't know why, but the serial interrupts simply
-         * don't work on simics
-         */
+           don't work on simics */
         virtual_timer_fnc = &serial_handler;