Changeset fcae007 in mainline for uspace/srv/hid/input/generic/input.c

Timestamp:

2012-01-22T13:23:21Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

08cc26b

Parents:

d9bbe45 (diff), 10a5479d (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 with mainline

File:

• uspace/srv/hid/input/generic/input.c (modified) (3 diffs)

uspace/srv/hid/input/generic/input.c

@@ -39 +39 @@
 #include <adt/list.h>
 #include <bool.h>
+#include <fibril_synch.h>
 #include <ipc/services.h>
 #include <ipc/input.h>
@@ -83 +84 @@
 async_sess_t *irc_sess = NULL;
 
+static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
+
 void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
 {
@@ -593 +596 @@
         int rc;
         
+        fibril_mutex_lock(&discovery_lock);
+        
         rc = dev_check_new_kbdevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
+        }
         
         rc = dev_check_new_mousedevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
-
+        }
+        
+        fibril_mutex_unlock(&discovery_lock);
+        
         return EOK;
 }