Changeset aa2b32c in mainline for uspace/lib/c/generic/io

Timestamp:

2013-04-29T12:44:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a269d05

Parents:

06b0211b (diff), 9e7898e (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

Location:

uspace/lib/c/generic/io

Files:

• con_srv.c (modified) (4 diffs)
• console.c (modified) (5 diffs)

uspace/lib/c/generic/io/con_srv.c

@@ -35 +35 @@
  */
 #include <errno.h>
+#include <io/cons_event.h>
 #include <ipc/console.h>
 #include <stdlib.h>
@@ -40 +41 @@
 
 #include <io/con_srv.h>
+
+static int console_ev_encode(cons_event_t *event, ipc_call_t *call)
+{
+        IPC_SET_ARG1(*call, event->type);
+
+        switch (event->type) {
+        case CEV_KEY:
+                IPC_SET_ARG2(*call, event->ev.key.type);
+                IPC_SET_ARG3(*call, event->ev.key.key);
+                IPC_SET_ARG4(*call, event->ev.key.mods);
+                IPC_SET_ARG5(*call, event->ev.key.c);
+                break;
+        case CEV_POS:
+                IPC_SET_ARG2(*call, (event->ev.pos.pos_id << 16) | (event->ev.pos.type & 0xffff));
+                IPC_SET_ARG3(*call, event->ev.pos.btn_num);
+                IPC_SET_ARG4(*call, event->ev.pos.hpos);
+                IPC_SET_ARG5(*call, event->ev.pos.vpos);
+                break;
+        default:
+                return EIO;
+        }
+
+        return EOK;
+}
 
 static void con_read_srv(con_srv_t *srv, ipc_callid_t callid,
@@ -273 +298 @@
 {
         int rc;
-        kbd_event_t event;
+        cons_event_t event;
+        ipc_call_t result;
 
         if (srv->srvs->ops->get_event == NULL) {
@@ -281 +307 @@
 
         rc = srv->srvs->ops->get_event(srv, &event);
-        async_answer_4(callid, rc, event.type, event.key, event.mods, event.c);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        rc = console_ev_encode(&event, &result);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        async_answer_5(callid, rc, IPC_GET_ARG1(result), IPC_GET_ARG2(result),
+            IPC_GET_ARG3(result), IPC_GET_ARG4(result), IPC_GET_ARG5(result));
 }
 

uspace/lib/c/generic/io/console.c

@@ -154 +154 @@
 }
 
-bool console_get_kbd_event(console_ctrl_t *ctrl, kbd_event_t *event)
+static int console_ev_decode(ipc_call_t *call, cons_event_t *event)
+{
+        event->type = IPC_GET_ARG1(*call);
+
+        switch (event->type) {
+        case CEV_KEY:
+                event->ev.key.type = IPC_GET_ARG2(*call);
+                event->ev.key.key = IPC_GET_ARG3(*call);
+                event->ev.key.mods = IPC_GET_ARG4(*call);
+                event->ev.key.c = IPC_GET_ARG5(*call);
+                break;
+        case CEV_POS:
+                event->ev.pos.pos_id = IPC_GET_ARG2(*call) >> 16;
+                event->ev.pos.type = IPC_GET_ARG2(*call) & 0xffff;
+                event->ev.pos.btn_num = IPC_GET_ARG3(*call);
+                event->ev.pos.hpos = IPC_GET_ARG4(*call);
+                event->ev.pos.vpos = IPC_GET_ARG5(*call);
+                break;
+        default:
+                return EIO;
+        }
+
+        return EOK;
+}
+
+bool console_get_event(console_ctrl_t *ctrl, cons_event_t *event)
 {
         if (ctrl->input_aid == 0) {
-                sysarg_t type;
-                sysarg_t key;
-                sysarg_t mods;
-                sysarg_t c;
+                ipc_call_t result;
                 
                 async_exch_t *exch = async_exchange_begin(ctrl->input_sess);
-                int rc = async_req_0_4(exch, CONSOLE_GET_EVENT, &type, &key, &mods, &c);
+                aid_t aid = async_send_0(exch, CONSOLE_GET_EVENT, &result);
                 async_exchange_end(exch);
+                
+                sysarg_t rc;
+                async_wait_for(aid, &rc);
                 
                 if (rc != EOK) {
@@ -171 +196 @@
                 }
                 
-                event->type = type;
-                event->key = key;
-                event->mods = mods;
-                event->c = c;
+                rc = console_ev_decode(&result, event);
+                if (rc != EOK) {
+                        errno = rc;
+                        return false;
+                }
         } else {
                 sysarg_t retval;
@@ -186 +212 @@
                 }
                 
-                event->type = IPC_GET_ARG1(ctrl->input_call);
-                event->key = IPC_GET_ARG2(ctrl->input_call);
-                event->mods = IPC_GET_ARG3(ctrl->input_call);
-                event->c = IPC_GET_ARG4(ctrl->input_call);
+                int rc = console_ev_decode(&ctrl->input_call, event);
+                if (rc != EOK) {
+                        errno = rc;
+                        return false;
+                }
         }
         
@@ -195 +222 @@
 }
 
-bool console_get_kbd_event_timeout(console_ctrl_t *ctrl, kbd_event_t *event,
+bool console_get_event_timeout(console_ctrl_t *ctrl, cons_event_t *event,
     suseconds_t *timeout)
 {
@@ -223 +250 @@
         }
         
-        event->type = IPC_GET_ARG1(ctrl->input_call);
-        event->key = IPC_GET_ARG2(ctrl->input_call);
-        event->mods = IPC_GET_ARG3(ctrl->input_call);
-        event->c = IPC_GET_ARG4(ctrl->input_call);
+        rc = console_ev_decode(&ctrl->input_call, event);
+        if (rc != EOK) {
+                errno = rc;
+                return false;
+        }
         
         /* Update timeout */