Changeset cf28036 in mainline

Timestamp:

2006-06-01T11:06:34Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

a2ae4f4

Parents:

ad123964

Message:

Console stores unsatisfied getchar requests and handle them after keypress.
Fifo modified to be usable as structure member.

Files:

• console/console.c (modified) (5 diffs)
• libc/include/libadt/fifo.h (modified) (2 diffs)

console/console.c

@@ -38 +38 @@
 #include <unistd.h>
 #include <async.h>
+#include <libadt/fifo.h>
 
 static void sysput(char c)
@@ -46 +47 @@
 //#define CONSOLE_COUNT VFB_CONNECTIONS
 #define CONSOLE_COUNT 8
+#define MAX_KEYREQUESTS_BUFFERED 32
 
 #define NAME "CONSOLE"
 
 int active_console = 1;
-
 
 typedef struct {
         keybuffer_t keybuffer;
+        FIFO_CREATE_STATIC(keyrequests, ipc_callid_t , MAX_KEYREQUESTS_BUFFERED);
+        int keyrequest_counter;
         int client_phone;
-        int vfb_number; /* Not used */
         int vfb_phone;
         int used;
@@ -107 +109 @@
                         /* got key from keyboard driver */
                         
-                        /* find active console */
-                        
-                        /* if client is awaiting key, send it */
-                        
-                        /*FIXME: else store key to its buffer */
                         retval = 0;
                         c = IPC_GET_ARG1(call);
 //                      ipc_call_sync_2(connections[3].vfb_phone, FB_PUTCHAR, 0, c,NULL,NULL);
+                
                         /* switch to another virtual console */
+                        
                         if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
                                 active_console = c - KBD_KEY_F1;
                                 break;
                         }
+                        
+                        /* if client is awaiting key, send it */
+                        if (connections[active_console].keyrequest_counter > 0) {               
+                                connections[active_console].keyrequest_counter--;
+                                ipc_answer_fast(fifo_pop(connections[active_console].keyrequests), 0, c, 0);
+                                break;
+                        }
+                        
+                        /*FIXME: else store key to its buffer */
                         keybuffer_push(&(connections[active_console].keybuffer), c);
                         
@@ -172 +180 @@
 
                 case CONSOLE_GETCHAR:
-                        /* FIXME: Only temporary solution until request storage will be created  */
-                        while (keybuffer_empty(&(connections[consnum].keybuffer))) {
-                                /* FIXME: buffer empty -> store request */
-                                async_usleep(1000);
+                        if (keybuffer_empty(&(connections[consnum].keybuffer))) {
+                                /* buffer is empty -> store request */
+                                if (connections[consnum].keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) {               
+                                        fifo_push(connections[consnum].keyrequests, callid);
+                                        connections[consnum].keyrequest_counter++;
+                                } else {
+                                        /* no key available and too many requests => fail */
+                                        ipc_answer_fast(callid, ELIMIT, 0, 0);
+                                }
+                                continue;
                         };
                         keybuffer_pop(&(connections[consnum].keybuffer), (char *)&arg1);
@@ -209 +223 @@
                 connections[i].used = 0;
                 keybuffer_init(&(connections[i].keybuffer));
+                
                 /* TODO: init key_buffer */
                 while ((connections[i].vfb_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) {
                         usleep(10000);
-                        //ipc_call_async_2(connections[i].vfb_phone, FB_PUTCHAR, 'a', 'b', NULL, (void *)NULL); 
                 }
+                connections[i].keyrequests.head = connections[i].keyrequests.tail = 0;
+                connections[i].keyrequests.items = MAX_KEYREQUESTS_BUFFERED;
+                connections[i].keyrequest_counter = 0;
         }
         

libc/include/libadt/fifo.h

@@ -45 +45 @@
 typedef unsigned long fifo_index_t;
 
+#define FIFO_CREATE_STATIC(name, t, itms)               \
+        struct {                                        \
+                t fifo[(itms)];                         \
+                fifo_count_t items;                     \
+                fifo_index_t head;                      \
+                fifo_index_t tail;                      \
+        } name
+
 /** Create and initialize static FIFO.
  *
@@ -55 +63 @@
  */
 #define FIFO_INITIALIZE_STATIC(name, t, itms)           \
-        struct {                                        \
-                t fifo[(itms)];                         \
-                fifo_count_t items;                     \
-                fifo_index_t head;                      \
-                fifo_index_t tail;                      \
-        } name = {                                      \
+        FIFO_CREATE_STATIC(name, t, itms) = {           \
                 .items = (itms),                        \
                 .head = 0,                              \