Changeset 047fbc8 in mainline for uspace/drv/bus/usb/xhci/hc.c

Timestamp:

2018-01-25T20:27:21Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

a94cbfa

Parents:

629255a

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-25 20:27:16)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 20:27:21)

Message:

xhci rh: have standalone buffer for events

File:

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

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

@@ -549 +549 @@
 }
 
-static int handle_port_status_change_event(xhci_hc_t *hc, xhci_trb_t *trb)
-{
-        uint8_t port_id = XHCI_QWORD_EXTRACT(trb->parameter, 31, 24);
-        usb_log_debug("Port status change event detected for port %u.", port_id);
-        xhci_rh_handle_port_change(&hc->rh, port_id);
-        return EOK;
-}
-
 typedef int (*event_handler) (xhci_hc_t *, xhci_trb_t *trb);
 
@@ -563 +555 @@
  */
 static event_handler event_handlers [] = {
-        [XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT] = &handle_port_status_change_event,
         [XHCI_TRB_TYPE_TRANSFER_EVENT] = &xhci_handle_transfer_event,
 };
@@ -586 +577 @@
                 return xhci_sw_ring_enqueue(&hc->sw_ring, trb);
 
+        if (type == XHCI_TRB_TYPE_PORT_STATUS_CHANGE_EVENT)
+                return xhci_sw_ring_enqueue(&hc->rh.event_ring, trb);
+
         return ENOTSUP;
 }
@@ -606 +600 @@
         fibril_mutex_lock(&hc->event_fibril_completion.guard);
         hc->event_fibril_completion.active = false;
-        fibril_condvar_wait(&hc->event_fibril_completion.cv,
-            &hc->event_fibril_completion.guard);
+        fibril_condvar_broadcast(&hc->event_fibril_completion.cv);
         fibril_mutex_unlock(&hc->event_fibril_completion.guard);