Changeset 0fcccd9 in mainline

Timestamp:

2018-01-12T11:49:01Z (7 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.

Location:

uspace/drv/hid/usbhid

Files:

• generic/hiddev.c (modified) (1 diff)
• kbd/kbddev.c (modified) (1 diff)
• main.c (modified) (1 diff)
• mouse/mousedev.c (modified) (1 diff)
• multimedia/multimedia.c (modified) (3 diffs)
• usbhid.c (modified) (4 diffs)
• usbhid.h (modified) (1 diff)

uspace/drv/hid/usbhid/generic/hiddev.c

@@ -220 +220 @@
 {
         /* Continue polling until the device is about to be removed. */
-        return !hid_dev->will_deinit;
+        return !hid_dev->poll_stop;
 }
 

uspace/drv/hid/usbhid/kbd/kbddev.c

@@ -710 +710 @@
 
         /* Continue polling until the device is about to be removed. */
-        return !hid_dev->will_deinit;
+        return !hid_dev->poll_stop;
 }
 

uspace/drv/hid/usbhid/main.c

@@ -144 +144 @@
 
         /* Join polling fibril. */
-        fibril_mutex_lock(&hid_dev->guard);
+        fibril_mutex_lock(&hid_dev->poll_guard);
         while (hid_dev->running)
-                fibril_condvar_wait(&hid_dev->poll_end, &hid_dev->guard);
-        fibril_mutex_unlock(&hid_dev->guard);
+                fibril_condvar_wait(&hid_dev->poll_cv, &hid_dev->poll_guard);
+        fibril_mutex_unlock(&hid_dev->poll_guard);
 
         /* Clean up. */

uspace/drv/hid/usbhid/mouse/mousedev.c

@@ -415 +415 @@
 
         /* Continue polling until the device is about to be removed. */
-        return !hid_dev->will_deinit;
+        return !hid_dev->poll_stop;
 }
 

uspace/drv/hid/usbhid/multimedia/multimedia.c

@@ -246 +246 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         if (path == NULL)
-                return !hid_dev->will_deinit; /* This might be a temporary failure. */
+                return !hid_dev->poll_stop; /* This might be a temporary failure. */
 
         int ret =
@@ -252 +252 @@
         if (ret != EOK) {
                 usb_hid_report_path_free(path);
-                return !hid_dev->will_deinit; /* This might be a temporary failure. */
+                return !hid_dev->poll_stop; /* This might be a temporary failure. */
         }
 
@@ -284 +284 @@
         usb_hid_report_path_free(path);
 
-        return !hid_dev->will_deinit;
+        return !hid_dev->poll_stop;
 }
 /**

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

uspace/drv/hid/usbhid/usbhid.h

@@ -132 +132 @@
         volatile bool running;
 
-        volatile bool will_deinit;
-        fibril_mutex_t guard;
-        fibril_condvar_t poll_end;
+        /** True if polling should stop as soon as possible */
+        volatile bool poll_stop;
+
+        /** Synchronization primitives for joining polling end. */
+        fibril_mutex_t poll_guard;
+        fibril_condvar_t poll_cv;
 };