Changeset 73a5857 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2018-01-31T23:31:05Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

53fdf8c

Parents:

2ca5a198

Message:

usbhost: add joinable_fibril utility

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (4 diffs)

uspace/drv/bus/usb/xhci/rh.c

@@ -96 +96 @@
         }
 
-        fid_t fid = fibril_create(&rh_worker, rh);
-        if (!fid) {
+        rh->event_worker = joinable_fibril_create(&rh_worker, rh);
+        if (!rh->event_worker) {
                 free(rh->ports);
                 return err;
@@ -113 +113 @@
         xhci_sw_ring_init(&rh->event_ring, rh->max_ports);
 
-        hc->event_fibril_completion.active = true;
-        fibril_mutex_initialize(&hc->event_fibril_completion.guard);
-        fibril_condvar_initialize(&hc->event_fibril_completion.cv);
-
-        fibril_add_ready(fid);
+        joinable_fibril_start(rh->event_worker);
 
         return EOK;
@@ -132 +128 @@
 
         xhci_sw_ring_stop(&rh->event_ring);
-
-        // TODO: completion_wait
-        fibril_mutex_lock(&rh->event_fibril_completion.guard);
-        while (rh->event_fibril_completion.active)
-                fibril_condvar_wait(&rh->event_fibril_completion.cv,
-                    &rh->event_fibril_completion.guard);
-        fibril_mutex_unlock(&rh->event_fibril_completion.guard);
+        joinable_fibril_join(rh->event_worker);
         xhci_sw_ring_fini(&rh->event_ring);
         return EOK;
@@ -332 +322 @@
         }
 
-        // TODO: completion_complete
-        fibril_mutex_lock(&rh->event_fibril_completion.guard);
-        rh->event_fibril_completion.active = false;
-        fibril_condvar_broadcast(&rh->event_fibril_completion.cv);
-        fibril_mutex_unlock(&rh->event_fibril_completion.guard);
-
-        return EOK;
+        return 0;
 }