Changeset 390a678 in mainline

Timestamp:

2006-06-02T14:54:42Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

3be8401

Parents:

5b6de81

Message:

Console support for communication with fb via shared memory.

File:

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

console/console.c

@@ -40 +40 @@
 #include <libadt/fifo.h>
 #include <screenbuffer.h>
+#include <sys/mman.h>
 
 #define CONSOLE_COUNT 12 
@@ -46 +47 @@
 #define NAME "CONSOLE"
 
-int active_console = 1;
+int active_console = 0;
 
 struct {
@@ -66 +67 @@
 
 connection_t connections[CONSOLE_COUNT];
-
+keyfield_t *interbuffer = NULL;
+        
 static int find_free_connection() 
 {
@@ -157 +159 @@
         char c,d;
         connection_t *conn;
-        keyfield_t *interbuffer = NULL;
-
-//      interbuffer = mmap(,, PROTO_READ|PROTO_WRITE, MAP_ANONYMOUS, , );       
         
         /* Ignore parameters, the connection is alread opened */
@@ -186 +185 @@
 
                                 ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 0, NULL, NULL); 
-                                ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL);
+                
+                                if (interbuffer) {
+                                        for (i = 0; i < fb_info.cols * fb_info.rows; i++)
+                                                interbuffer[i] = conn->screenbuffer.buffer[i];  
+                                        ipc_call_sync(fb_info.phone, FB_DRAW_TEXT_DATA, 0, NULL);               
+                                } else {
+
+                                        ipc_call_async_2(fb_info.phone, FB_CLEAR, 0, 0, NULL, NULL);
                                 
-                                for (i = 0; i < conn->screenbuffer.size_x; i++)
-                                        for (j = 0; j < conn->screenbuffer.size_y; j++) {
-                                                d = get_field_at(&(conn->screenbuffer),i, j)->character;
-                                                if (d && d != ' ')
-                                                        ipc_call_async_3(fb_info.phone, FB_PUTCHAR, d, j, i, NULL, NULL);
-                                        }
-
-                                ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x, NULL, NULL); 
+                                        
+                                        for (i = 0; i < conn->screenbuffer.size_x; i++)
+                                                for (j = 0; j < conn->screenbuffer.size_y; j++) {
+                                                        d = get_field_at(&(conn->screenbuffer),i, j)->character;
+                                                        if (d && d != ' ')
+                                                                ipc_call_async_3(fb_info.phone, FB_PUTCHAR, d, j, i, NULL, NULL);
+                                                }
+
+                                        ipc_call_async_2(fb_info.phone, FB_CURSOR_GOTO, conn->screenbuffer.position_y, conn->screenbuffer.position_x, NULL, NULL); 
+                                }
                                 ipc_call_async(fb_info.phone, FB_CURSOR_VISIBILITY, 1, NULL, NULL); 
 
@@ -327 +335 @@
         }
         
+        if ((interbuffer = mmap(NULL, sizeof(keyfield_t) * fb_info.cols * fb_info.rows , PROTO_READ|PROTO_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, 0 ,0 )) != NULL) {
+                if (ipc_call_sync_3(fb_info.phone, IPC_M_AS_AREA_SEND, (ipcarg_t)interbuffer, 0, AS_AREA_READ | AS_AREA_CACHEABLE, NULL, NULL, NULL) != 0) {
+//                      ipc_call_async_3(fb_info.phone, FB_PUTCHAR, '?', 10, 10, NULL, NULL);
+                        munmap(interbuffer, sizeof(keyfield_t) * fb_info.cols * fb_info.rows);
+                        interbuffer = NULL;
+                }
+/*      } else {
+                ipc_call_async_3(fb_info.phone, FB_PUTCHAR, '!', 10, 10, NULL, NULL);
+*/
+        }
+        
         async_new_connection(phonehash, 0, NULL, keyboard_events);