Changeset 0fcccd9 in mainline for uspace/drv/hid/usbhid/usbhid.c

Timestamp:

2018-01-12T11:49:01Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

99a00a6

Parents:

fcdab1e

git-author:

Petr Manek <petr.manek@…> (2018-01-12 11:48:53)

git-committer:

Petr Manek <petr.manek@…> (2018-01-12 11:49:01)

Message:

usbhid: refactoring

Renamed polling synchronization primitives with the same convention as
in usbhub. Added some documentation.

File:

• uspace/drv/hid/usbhid/usbhid.c (modified) (4 diffs)

uspace/drv/hid/usbhid/usbhid.c

@@ -355 +355 @@
         hid_dev->poll_pipe_mapping = NULL;
 
-        hid_dev->will_deinit = false;
-        fibril_mutex_initialize(&hid_dev->guard);
-        fibril_condvar_initialize(&hid_dev->poll_end);
+        hid_dev->poll_stop = false;
+        fibril_mutex_initialize(&hid_dev->poll_guard);
+        fibril_condvar_initialize(&hid_dev->poll_cv);
 
         int rc = usb_hid_check_pipes(hid_dev, dev);
@@ -506 +506 @@
 
         /* Continue polling until the device is about to be removed. */
-        return hid_dev->running && !hid_dev->will_deinit;
+        return hid_dev->running && !hid_dev->poll_stop;
 }
 
@@ -526 +526 @@
 
         /* Signal polling end to joining thread. */
-        fibril_mutex_lock(&hid_dev->guard);
-        fibril_condvar_signal(&hid_dev->poll_end);
-        fibril_mutex_unlock(&hid_dev->guard);
+        fibril_mutex_lock(&hid_dev->poll_guard);
+        fibril_condvar_signal(&hid_dev->poll_cv);
+        fibril_mutex_unlock(&hid_dev->poll_guard);
 }
 
@@ -544 +544 @@
 {
         assert(hid_dev);
-        hid_dev->will_deinit = true;
+        hid_dev->poll_stop = true;
 }