Changeset e1c4849 in mainline for console/console.c

Timestamp:

2006-06-02T17:16:59Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

0c6984e

Parents:

3756912

Message:

Added slighyly graphical console.

File:

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

console/console.c

@@ -42 +42 @@
 #include <sys/mman.h>
 
+#include "gcons.h"
+
 #define MAX_KEYREQUESTS_BUFFERED 32
 
@@ -178 +180 @@
 //                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
                         if ((c >= '0') && (c < '0' + CONSOLE_COUNT)) {
-                                
                                 if (c == '0') {
                                         /* switch to kernel console*/
@@ -193 +194 @@
                                                 break;
                                         active_console = c;
+                                        gcons_change_console(c);
+                                
                                 }
                                 
@@ -337 +340 @@
                 usleep(10000);
         }
+
+        /* Initialize gcons */
+        gcons_init(fb_info.phone);
+        /* Synchronize, the gcons can have something in queue */
+        sync_send_2(fb_info.phone, FB_GET_CSIZE, 0, 0, NULL, NULL);
+
         
         ipc_call_sync_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols)); 
@@ -368 +377 @@
         async_new_connection(phonehash, 0, NULL, keyboard_events);
         
-        nsend_call_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0); 
+        sync_send_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0, NULL, NULL); 
         nsend_call(fb_info.phone, FB_CURSOR_VISIBILITY, 1);