Changeset a116ef22 in mainline

Timestamp:

2006-06-02T15:56:46Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

b1f51f0

Parents:

bc54f56e

Message:

Support for switch to kernel console.

File:

• console/console.c (modified) (2 diffs)

console/console.c

@@ -172 +172 @@
                         
                         retval = 0;
-                        c = IPC_GET_ARG1(call);
+                        c = IPC_GET_ARG1(call) - '0';
                         /* switch to another virtual console */
                         
                         conn = &connections[active_console];
 //                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
-                        if ((c >= '1') && (c < '1' + CONSOLE_COUNT)) {
+                        if ((c >= 0) && (c < CONSOLE_COUNT)) {
                                 /*FIXME: draw another console content from buffer */
-                                if (c - '1' == active_console)
+                                if (c == active_console)
                                                 break;
-                                active_console = c - '1';
+                                
+                                if (c == 0) {
+                                        /* switch to kernel console*/
+                                         __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+                                         
+                                } else {
+                                        active_console = c;
+                                }
+                                
+                                
                                 conn = &connections[active_console];
 
@@ -191 +200 @@
                                                         interbuffer[i + j*conn->screenbuffer.size_x] = *get_field_at(&(conn->screenbuffer),i, j);
                                                         
-                                        ipc_call_sync(fb_info.phone, FB_DRAW_TEXT_DATA, 0, NULL);               
+                                        sync_send_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);                
                                 } else {