Changeset 516ff92 in mainline for kernel/arch/arm32

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/arm32

Files:

• include/machine.h (modified) (1 diff)
• src/drivers/gxemul.c (modified) (1 diff)

kernel/arch/arm32/include/machine.h

@@ -103 +103 @@
 
 
-#ifdef MACHINE_GXEMUL_TESTARM   
-#define machine_console_init(devno)           gxemul_console_init(devno)
-#define machine_grab_console                  gxemul_grab_console
-#define machine_release_console               gxemul_release_console 
-#define machine_hw_map_init                   gxemul_hw_map_init
-#define machine_timer_irq_start               gxemul_timer_irq_start
-#define machine_cpu_halt                      gxemul_cpu_halt
-#define machine_get_memory_size               gxemul_get_memory_size
-#define machine_debug_putc(ch)                gxemul_debug_putc(ch)
-#define machine_irq_exception(exc_no, istate) \
-        gxemul_irq_exception(exc_no, istate)
-#define machine_get_fb_address                gxemul_get_fb_address
+#ifdef MACHINE_GXEMUL_TESTARM
+        #define machine_console_init(devno)            gxemul_console_init(devno)
+        #define machine_grab_console                   gxemul_grab_console
+        #define machine_release_console                gxemul_release_console 
+        #define machine_hw_map_init                    gxemul_hw_map_init
+        #define machine_timer_irq_start                gxemul_timer_irq_start
+        #define machine_cpu_halt                       gxemul_cpu_halt
+        #define machine_get_memory_size                gxemul_get_memory_size
+        #define machine_debug_putc(ch)                 gxemul_debug_putc(ch)
+        #define machine_irq_exception(exc_no, istate)  gxemul_irq_exception(exc_no, istate)
+        #define machine_get_fb_address                 gxemul_get_fb_address
 #endif
 

kernel/arch/arm32/src/drivers/gxemul.c

@@ -134 +134 @@
  * @param ch Characted to be printed.
  */
-static void gxemul_write(chardev_t *dev, const char ch)
-{
-        *((char *) gxemul_hw_map.videoram) = ch;
+static void gxemul_write(chardev_t *dev, const char ch, bool silent)
+{
+        if (!silent)
+                *((char *) gxemul_hw_map.videoram) = ch;
 }