Changeset 73a5857 in mainline for uspace/drv/bus/usb/xhci/hc.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/hc.c (modified) (3 diffs)

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

@@ -277 +277 @@
                 goto err_cmd;
 
-        fid_t fid = fibril_create(&event_worker, hc);
-        if (!fid)
+        hc->event_worker = joinable_fibril_create(&event_worker, hc);
+        if (!hc->event_worker)
                 goto err_bus;
 
-        // TODO: completion_reset
-        hc->event_fibril_completion.active = true;
-        fibril_mutex_initialize(&hc->event_fibril_completion.guard);
-        fibril_condvar_initialize(&hc->event_fibril_completion.cv);
-
         xhci_sw_ring_init(&hc->sw_ring, PAGE_SIZE / sizeof(xhci_trb_t));
 
-        fibril_add_ready(fid);
+        joinable_fibril_start(hc->event_worker);
 
         return EOK;
@@ -598 +593 @@
         }
 
-        // TODO: completion_complete
-        fibril_mutex_lock(&hc->event_fibril_completion.guard);
-        hc->event_fibril_completion.active = false;
-        fibril_condvar_broadcast(&hc->event_fibril_completion.cv);
-        fibril_mutex_unlock(&hc->event_fibril_completion.guard);
-
-        return EOK;
+        return 0;
 }
 
@@ -688 +677 @@
 {
         xhci_sw_ring_stop(&hc->sw_ring);
-
-        // TODO: completion_wait
-        fibril_mutex_lock(&hc->event_fibril_completion.guard);
-        while (hc->event_fibril_completion.active)
-                fibril_condvar_wait(&hc->event_fibril_completion.cv,
-                    &hc->event_fibril_completion.guard);
-        fibril_mutex_unlock(&hc->event_fibril_completion.guard);
+        joinable_fibril_join(hc->event_worker);
         xhci_sw_ring_fini(&hc->sw_ring);