Changeset bf45993 in mainline for uspace/srv/hid/input/input.c

Timestamp:

2014-09-19T10:56:30Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6b646dc

Parents:

824208bf (diff), 58f26cb (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/input/input.c (modified) (4 diffs)

uspace/srv/hid/input/input.c

@@ -90 +90 @@
 static client_t *active_client = NULL;
 
+/** Kernel override */
+static bool active = true;
+
 /** List of keyboard devices */
 static list_t kbd_devs;
@@ -295 +298 @@
 
 /** Arbitrate client actiovation */
-static void client_arbitration(client_t *req)
+static void client_arbitration(void)
 {
         /* Mutual exclusion of active clients */
         list_foreach(clients, link, client_t, client)
-                client->active = (client == req);
+                client->active = ((active) && (client == active_client));
         
         /* Notify clients about the arbitration */
@@ -347 +350 @@
                         case INPUT_ACTIVATE:
                                 active_client = client;
-                                client_arbitration(client);
+                                client_arbitration();
                                 async_answer_0(callid, EOK);
                                 break;
@@ -362 +365 @@
         if (IPC_GET_ARG1(*call)) {
                 /* Kernel console activated */
-                client_arbitration(NULL);
+                active = false;
         } else {
                 /* Kernel console deactivated */
-                client_arbitration(active_client);
-        }
+                active = true;
+        }
+        
+        client_arbitration();
 }