Changeset 380e23a3 in mainline

Timestamp:

2014-09-16T21:22:16Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

58f26cb

Parents:

5c79fb5

Message:

to actually guarantee mutual exclusion of the kernel and user space input/output, a tri-state logic is required

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();
 }