Changeset b27a97bb in mainline for console/console.c

Timestamp:

2006-05-31T15:41:19Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

c0e674a

Parents:

440cff5

Message:

Support for reading from stdin.
Getchar() implemented.

File:

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

console/console.c

@@ -100 +100 @@
                 case KBD_PUSHCHAR:
                         /* got key from keyboard driver */
+                        
                         /* find active console */
+                        
                         /* if client is awaiting key, send it */
+                        
                         /*FIXME: else store key to its buffer */
                         retval = 0;
@@ -113 +116 @@
                         /* Send it to first FB, DEBUG */
 //                      ipc_call_async_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL);
-                        ipc_call_sync_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL);
+//                      ipc_call_sync_2(connections[0].vfb_phone, FB_PUTCHAR, 0, IPC_GET_ARG1(call),NULL,NULL);
 
                         break;
@@ -149 +152 @@
                         return;
                 case CONSOLE_PUTCHAR:
-                        /* TODO: send message to fb */
+                        /* Send message to fb */
                         ipc_call_async_2(connections[consnum].vfb_phone, FB_PUTCHAR, IPC_GET_ARG1(call), IPC_GET_ARG2(call), NULL, NULL); 
                         break;
                 case CONSOLE_GETCHAR:
-                        /* FIXME: */
-                        if (!keybuffer_pop(&(connections[active_client].keybuffer), (char *)&arg1)) {
+                        /* FIXME: Only temporary solution until request storage will be created  */
+                        
+                        while (!keybuffer_pop(&(connections[active_client].keybuffer), (char *)&arg1)) {
                                 /* FIXME: buffer empty -> store request */
-                                arg1 = 'X'; /* Only temporary */
+                                usleep(10000);
                         };
-//ipc_call_async_2(connections[active_client].vfb_phone, FB_PUTCHAR, ' ', arg1, NULL, (void *)NULL); 
+                        
                         break;
                 }
-                ipc_answer_fast(callid, 0,0,0);
+                ipc_answer_fast(callid, 0, arg1, 0);
         }
 }
@@ -190 +194 @@
                 /* TODO: init key_buffer */
                 while ((connections[i].vfb_phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) {
-                                
-                        ipc_call_async_2(connections[i].vfb_phone, FB_PUTCHAR, 'a', 'b', NULL, (void *)NULL); 
+                        usleep(10000);
+                        //ipc_call_async_2(connections[i].vfb_phone, FB_PUTCHAR, 'a', 'b', NULL, (void *)NULL); 
                 }
         }