Changeset 15d0046 in mainline for uspace/lib/c/generic/io/input.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/lib/c/generic/io/input.c (modified) (2 diffs)

uspace/lib/c/generic/io/input.c

@@ -80 +80 @@
 }
 
-int input_yield(input_t *input)
+int input_activate(input_t *input)
 {
         async_exch_t *exch = async_exchange_begin(input->sess);
-
-        int rc = async_req_0_0(exch, INPUT_YIELD);
+        int rc = async_req_0_0(exch, INPUT_ACTIVATE);
         async_exchange_end(exch);
-
+        
         return rc;
 }
 
-int input_reclaim(input_t *input)
-{
-        async_exch_t *exch = async_exchange_begin(input->sess);
-
-        int rc = async_req_0_0(exch, INPUT_RECLAIM);
-        async_exchange_end(exch);
-
-        return rc;
+static void input_ev_active(input_t *input, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        int rc = input->ev_ops->active(input);
+        async_answer_0(callid, rc);
+}
+
+static void input_ev_deactive(input_t *input, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        int rc = input->ev_ops->deactive(input);
+        async_answer_0(callid, rc);
 }
 
@@ -178 +181 @@
 
                 switch (IPC_GET_IMETHOD(call)) {
+                case INPUT_EVENT_ACTIVE:
+                        input_ev_active(input, callid, &call);
+                        break;
+                case INPUT_EVENT_DEACTIVE:
+                        input_ev_deactive(input, callid, &call);
+                        break;
                 case INPUT_EVENT_KEY:
                         input_ev_key(input, callid, &call);