Changeset 1035437 in mainline

Timestamp:

2009-06-04T13:05:25Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8bfe48e

Parents:

c8b9f88

Message:

keep the kernel console intact as long as it is possible (to be able to see any out-of-order errors)

Location:

uspace/srv/console

Files:

• console.c (modified) (2 diffs)
• gcons.c (modified) (1 diff)

uspace/srv/console/console.c

@@ -793 +793 @@
         }
         
+        /* Disable kernel output to the console */
+        __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
+        
         /* Initialize the screen */
+        gcons_redraw_console();
         set_rgb_color(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
         screen_clear();
@@ -812 +816 @@
         printf(NAME ": HelenOS Console service\n");
         
-        /* Disable kernel output to the console */
-        __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
-        
-        if (!console_init()) {
-                __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+        if (!console_init())
                 return -1;
-        }
         
         printf(NAME ": Accepting connections\n");

uspace/srv/console/gcons.c

@@ -537 +537 @@
         console_state[KERNEL_CONSOLE] = CONS_KERNEL;
         
-        gcons_redraw_console();
+        vp_switch(console_vp);
 }