Changeset 51c1b003 in mainline

Timestamp:

2006-05-29T13:34:40Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

854387b

Parents:

d1e70c7

Message:

First attempt to uspace console. Not working yet.

Files:

• Makefile (modified) (1 diff)
• console/Makefile (added)
• console/console.c (added)
• fb/fb.c (modified) (1 diff)
• init/init.c (modified) (2 diffs)
• kbd/generic/kbd.c (modified) (3 diffs)
• kbd/include/kbd.h (modified) (1 diff)
• libc/include/ipc/services.h (modified) (1 diff)

Makefile

@@ -38 +38 @@
         init \
         ns \
-        fb
+        fb \
+        console
 
 ifeq ($(ARCH), amd64)

fb/fb.c

@@ -161 +161 @@
         ipcarg_t retval, arg1, arg2;
 
-        if(!sysinfo_value("fb")) return -1;
-
+        if(!sysinfo_value("fb")) {
+                printf("Framebuffer initialization failed.\n");
+                return -1;
+        }
 
         if ((res = ipc_connect_to_me(PHONE_NS, SERVICE_VIDEO, 0, &phonead)) != 0) 
                 return -1;
         
-        init_fb();
+        if (init_fb() != 0) {
+                printf("Framebuffer initialization failed.\n");
+                return -1;
+        }
 
         async_manager();

init/init.c

@@ -306 +306 @@
 
         printf("Test: Starting connect...\n");
-        while ((phoneid = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) {
+        while ((phoneid = ipc_connect_me_to(PHONE_NS, SERVICE_CONSOLE, 0)) < 0) {
         };
         
         printf("Test: Connected: %d\n", res);
         printf("Test: pinging.\n");
-        while (1) {
+/*      while (1) {
+                
                 res = ipc_call_sync(phoneid, KBD_GETCHAR, 0xbeef,&result);
 //              printf("Test: Retval: %d - received: %c\n", res, result);
                 printf("%c", result);
         }
-        
+*/      
         printf("Test: Hangin up\n");
         ipc_hangup(phoneid);
@@ -336 +337 @@
         printf("Test: pinging.\n");
 
-        aid = async_send_2(phoneid, KBD_GETCHAR, 0, 0, &kbddata);
+
         while (1) {
-                if (async_wait_timeout(aid, NULL, 1000000)) {
-                        printf("^");
-                        continue;
-                }
-                printf("%c", IPC_GET_ARG1(kbddata));
-                aid = async_send_2(phoneid, KBD_GETCHAR, 0, 0, &kbddata);
         }
         

kbd/generic/kbd.c

@@ -36 +36 @@
 #include <arch/kbd.h>
 #include <kbd.h>
+#include <libadt/fifo.h>
 #include <key_buffer.h>
-#include <libadt/fifo.h>
 
 #define NAME "KBD"
-
-#define KBD_REQUEST_MAX 32 /**< Maximum requests buffered until keypress */
-
+void hello(void *private, int retval, ipc_call_t *data) {
+        printf("%s: got answer from console with retval %d.\n", NAME, retval);
+}
 int main(int argc, char **argv)
 {
         ipc_call_t call;
         ipc_callid_t callid;
+        int res;
+        ipcarg_t phonead;
+        int phoneid;
         char connected = 0;
-        int res;
-        int c;
-        ipcarg_t phonead;
         
         ipcarg_t retval, arg1, arg2;
-
-        /* Counter of unsatisfied calls */
-        fifo_count_t callers_counter = 0;
-        /* Fifo with callid's of unsatisfied calls requred for answer */
-        FIFO_INITIALIZE_STATIC(callers_buffer, ipc_callid_t, KBD_REQUEST_MAX);
 
         printf("Uspace kbd service started.\n");
@@ -83 +78 @@
                 switch (IPC_GET_METHOD(call)) {
                         case IPC_M_PHONE_HUNGUP:
-                                if (connected) {
-                                        /* If nobody's connected, clear keybuffer and dont store new keys */
-                                        if (--connected == 0) {
-                                                callers_counter = 0;
-                                                callers_buffer.head = callers_buffer.tail = 0;
-                                                key_buffer_free();      
-                                        }
-                                        
-                                        printf("%s: Phone hung up.\n", NAME);
-                                } else {
-                                        printf("%s: Oops, got phone hung up, but nobody connected.\n", NAME);
-                                }
-                                
+                                printf("%s: Phone hung up.\n", NAME);
+                                connected = 0;
                                 retval = 0;
                                 break;
@@ -108 +92 @@
                                 }
                                 break;
+                        case IPC_M_CONNECT_TO_ME:
+                                phoneid = IPC_GET_ARG3(call);
+                                retval = 0;
+                                break;
+
                         case IPC_M_INTERRUPT:
                                 if (connected) {
-                                        /* recode scancode and store it into key buffer */
+                                        /* recode to ASCII - one interrupt can produce more than one code so result is stored in fifo */
                                         kbd_arch_process(IPC_GET_ARG2(call));
-                                        //printf("%s: GOT INTERRUPT: %c\n", NAME, IPC_GET_ARG2(call));
+
+                                        //printf("%s: GOT INTERRUPT: %c\n", NAME, key);
 
                                         /* Some callers could awaiting keypress - if its true, we have to send keys to them.
                                          * One interrupt can store more than one key into buffer. */
+                                        
                                         retval = 0;
-                                        arg2 = 0xbeef;
-                                        while ((callers_counter) && (!key_buffer_empty())) {
-                                                callers_counter--;
+
+                                        while (!key_buffer_empty()) {
                                                 if (!key_buffer_pop((char *)&arg1)) {
-                                                        printf("%s: KeyBuffer empty but it should not be.\n");
+                                                        printf("%s: KeyBuffer is empty but it should not be.\n");
                                                         break;
                                                 }
-                                                ipc_answer_fast(fifo_pop(callers_buffer), retval, arg1, arg2);
+                                                /*FIXME: detection of closed connection */
+                                                ipc_call_async(phoneid, KBD_PUSHCHAR, arg1, 0, &hello);
                                         }
+
                                 }
-                                break;
-                        case KBD_GETCHAR:
-        //                      printf("%s: Getchar: ", NAME);
-                                retval = 0;
-                                arg1 = 0;       
-                                if (!key_buffer_pop((char *)&arg1)) {
-                                        if (callers_counter < KBD_REQUEST_MAX) {
-                                                callers_counter++;
-                                                fifo_push(callers_buffer, callid);
-                                        } else {
-                                                retval = ELIMIT;
-                                        }
-                                        continue;
-                                };
-                                arg2 = 0xbeef;
-                        //      printf("GetChar return %c\n", arg1);
-                                
+                                printf("%s: Interrupt processed.\n", NAME);
                                 break;
                         default:

kbd/include/kbd.h

@@ -30 +30 @@
 #define __KBD_H__
 
-#define KBD_GETCHAR 1024
+#define KBD_PUSHCHAR 1024
 
 #endif

libc/include/ipc/services.h

@@ -38 +38 @@
 #define SERVICE_FRAME_BUFFER    2
 #define SERVICE_KEYBOARD        3
-#define SERVICE_VIDEO           4
+#define SERVICE_VIDEO           4
+#define SERVICE_CONSOLE         5
 
 /* Memory area to be received from NS */