Changeset 2568c94 in mainline for uspace/srv/hid/console/console.c

Timestamp:

2012-08-17T17:15:19Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1789023

Parents:

4f351432 (diff), 01e397ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/hid/console/console.c (modified) (9 diffs)

uspace/srv/hid/console/console.c

@@ -36 +36 @@
 #include <stdio.h>
 #include <adt/prodcons.h>
-#include <ipc/input.h>
+#include <io/input.h>
 #include <ipc/console.h>
 #include <ipc/vfs.h>
@@ -43 +43 @@
 #include <loc.h>
 #include <event.h>
+#include <io/kbd_event.h>
 #include <io/keycode.h>
 #include <io/chargrid.h>
@@ -81 +82 @@
 } console_t;
 
-/** Session to the input server */
-static async_sess_t *input_sess;
+/** Input server proxy */
+static input_t *input;
 
 /** Session to the output server */
@@ -100 +101 @@
 static console_t *active_console = &consoles[0];
 static console_t *kernel_console = &consoles[KERNEL_CONSOLE];
+
+static int input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
+static int input_ev_move(input_t *, int, int);
+static int input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
+static int input_ev_button(input_t *, int, int);
+
+static input_ev_ops_t input_ev_ops = {
+        .key = input_ev_key,
+        .move = input_ev_move,
+        .abs_move = input_ev_abs_move,
+        .button = input_ev_button
+};
 
 static void cons_update(console_t *cons)
@@ -195 +208 @@
 }
 
-static void input_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-        /* Ignore parameters, the connection is already opened */
-        while (true) {
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                if (!IPC_GET_IMETHOD(call)) {
-                        /* TODO: Handle hangup */
-                        async_hangup(input_sess);
-                        return;
-                }
-                
-                kbd_event_type_t type;
-                keycode_t key;
-                keymod_t mods;
-                wchar_t c;
-                
-                switch (IPC_GET_IMETHOD(call)) {
-                case INPUT_EVENT_KEY:
-                        type = IPC_GET_ARG1(call);
-                        key = IPC_GET_ARG2(call);
-                        mods = IPC_GET_ARG3(call);
-                        c = IPC_GET_ARG4(call);
-                        
-                        if ((key >= KC_F1) && (key < KC_F1 + CONSOLE_COUNT) &&
-                            ((mods & KM_CTRL) == 0))
-                                cons_switch(&consoles[key - KC_F1]);
-                        else {
-                                /* Got key press/release event */
-                                kbd_event_t *event =
-                                    (kbd_event_t *) malloc(sizeof(kbd_event_t));
-                                if (event == NULL) {
-                                        async_answer_0(callid, ENOMEM);
-                                        break;
-                                }
-                                
-                                link_initialize(&event->link);
-                                event->type = type;
-                                event->key = key;
-                                event->mods = mods;
-                                event->c = c;
-                                
-                                /*
-                                 * Kernel console does not read events
-                                 * from us, so we will redirect them
-                                 * to the (last) active userspace console
-                                 * if necessary.
-                                 */
-                                console_t *target_console = cons_get_active_uspace();
-                                
-                                prodcons_produce(&target_console->input_pc,
-                                    &event->link);
-                        }
-                        
-                        async_answer_0(callid, EOK);
-                        break;
-                case INPUT_EVENT_MOVE:
-                        async_answer_0(callid, EOK);
-                        break;
-                case INPUT_EVENT_BUTTON:
-                        async_answer_0(callid, EOK);
-                        break;
-                default:
-                        async_answer_0(callid, EINVAL);
-                }
-        }
+static int input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key,
+    keymod_t mods, wchar_t c)
+{
+        if ((key >= KC_F1) && (key < KC_F1 + CONSOLE_COUNT) &&
+            ((mods & KM_CTRL) == 0)) {
+                cons_switch(&consoles[key - KC_F1]);
+        } else {
+                /* Got key press/release event */
+                kbd_event_t *event =
+                    (kbd_event_t *) malloc(sizeof(kbd_event_t));
+                if (event == NULL) {
+                        return ENOMEM;
+                }
+                
+                link_initialize(&event->link);
+                event->type = type;
+                event->key = key;
+                event->mods = mods;
+                event->c = c;
+                
+                /*
+                 * Kernel console does not read events
+                 * from us, so we will redirect them
+                 * to the (last) active userspace console
+                 * if necessary.
+                 */
+                console_t *target_console = cons_get_active_uspace();
+                
+                prodcons_produce(&target_console->input_pc,
+                    &event->link);
+        }
+        
+        return EOK;
+}
+
+static int input_ev_move(input_t *input, int dx, int dy)
+{
+        return EOK;
+}
+
+static int input_ev_abs_move(input_t *input, unsigned x , unsigned y,
+    unsigned max_x, unsigned max_y)
+{
+        return EOK;
+}
+
+static int input_ev_button(input_t *input, int bnum, int bpress)
+{
+        return EOK;
 }
 
@@ -518 +513 @@
 }
 
-static async_sess_t *input_connect(const char *svc)
+static int input_connect(const char *svc)
 {
         async_sess_t *sess;
@@ -524 +519 @@
         
         int rc = loc_service_get_id(svc, &dsid, 0);
-        if (rc == EOK) {
-                sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
-                if (sess == NULL) {
-                        printf("%s: Unable to connect to input service %s\n", NAME,
-                            svc);
-                        return NULL;
-                }
-        } else
-                return NULL;
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        rc = async_connect_to_me(exch, 0, 0, 0, input_events, NULL);
-        async_exchange_end(exch);
-        
+        if (rc != EOK) {
+                printf("%s: Input service %s not found\n", NAME, svc);
+                return rc;
+        }
+
+        sess = loc_service_connect(EXCHANGE_ATOMIC, dsid, 0);
+        if (sess == NULL) {
+                printf("%s: Unable to connect to input service %s\n", NAME,
+                    svc);
+                return EIO;
+        }
+        
+        rc = input_open(sess, &input_ev_ops, NULL, &input);
         if (rc != EOK) {
                 async_hangup(sess);
-                printf("%s: Unable to create callback connection to service %s (%s)\n",
+                printf("%s: Unable to communicate with service %s (%s)\n",
                     NAME, svc, str_error(rc));
-                return NULL;
-        }
-        
-        return sess;
+                return rc;
+        }
+        
+        return EOK;
 }
 
@@ -574 +568 @@
 static bool console_srv_init(char *input_svc, char *output_svc)
 {
+        int rc;
+        
         /* Connect to input service */
-        input_sess = input_connect(input_svc);
-        if (input_sess == NULL)
+        rc = input_connect(input_svc);
+        if (rc != EOK)
                 return false;
         
@@ -586 +582 @@
         /* Register server */
         async_set_client_connection(client_connection);
-        int rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register server (%s)\n", NAME,