Changeset 51c1d500 in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2018-01-20T17:16:33Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

6271a34

Parents:

abb5d08

Message:

xhci: move HC semantics from endpoint/device to hc module

File:

• uspace/drv/bus/usb/xhci/transfers.c (modified) (8 diffs)

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

@@ -120 +120 @@
 }
 
-static xhci_trb_ring_t *get_ring(xhci_hc_t *hc, xhci_transfer_t *transfer)
-{
-        xhci_endpoint_t *ep = xhci_endpoint_get(transfer->batch.ep);
-        if (ep->primary_stream_data_size == 0) return &ep->ring;
-        uint32_t stream_id = transfer->batch.target.stream;
-
-        xhci_stream_data_t *stream_data = xhci_get_stream_ctx_data(ep, stream_id);
-        if (stream_data == NULL) {
-                usb_log_warning("No transfer ring was found for stream %u.", stream_id);
-                return NULL;
-        }
-
-        return &stream_data->ring;
+static xhci_trb_ring_t *get_ring(xhci_transfer_t *transfer)
+{
+        xhci_endpoint_t *xhci_ep = xhci_endpoint_get(transfer->batch.ep);
+        return xhci_endpoint_get_ring(xhci_ep, transfer->batch.target.stream);
 }
 
@@ -138 +129 @@
 {
         usb_transfer_batch_t *batch = &transfer->batch;
-        xhci_trb_ring_t *ring = get_ring(hc, transfer);
         xhci_endpoint_t *xhci_ep = xhci_endpoint_get(transfer->batch.ep);
 
@@ -202 +192 @@
         }
 
-        return xhci_trb_ring_enqueue_multiple(ring, trbs, trbs_used, &transfer->interrupt_trb_phys);
+        return xhci_trb_ring_enqueue_multiple(get_ring(transfer), trbs, trbs_used, &transfer->interrupt_trb_phys);
 }
 
@@ -224 +214 @@
                 TRB_CTRL_SET_TRB_TYPE(trb, XHCI_TRB_TYPE_NORMAL);
 
-                xhci_trb_ring_t* ring = get_ring(hc, transfer);
+                xhci_trb_ring_t* ring = get_ring(transfer);
                 return xhci_trb_ring_enqueue(ring, &trb, &transfer->interrupt_trb_phys);
         }
@@ -233 +223 @@
                 TRB_CTRL_SET_ENT(trb, 1);
 
-                xhci_trb_ring_t* ring = get_ring(hc, transfer);
+                xhci_trb_ring_t* ring = get_ring(transfer);
                 if (!ring) {
                         return EINVAL;
@@ -269 +259 @@
         TRB_CTRL_SET_TRB_TYPE(trb, XHCI_TRB_TYPE_NORMAL);
 
-        xhci_trb_ring_t* ring = get_ring(hc, transfer);
+        xhci_trb_ring_t* ring = get_ring(transfer);
 
         return xhci_trb_ring_enqueue(ring, &trb, &transfer->interrupt_trb_phys);
@@ -313 +303 @@
                 /* We are received transfer pointer instead - work with that */
                 transfer = (xhci_transfer_t *) addr;
-                xhci_trb_ring_t * ring = get_ring(hc, transfer);
-                xhci_trb_ring_update_dequeue(ring, transfer->interrupt_trb_phys);
+                xhci_trb_ring_update_dequeue(get_ring(transfer), transfer->interrupt_trb_phys);
                 batch = &transfer->batch;
 
@@ -497 +486 @@
         }
 
+        hc_ring_ep_doorbell(xhci_ep, batch->target.stream);
+
         /* After the critical section, the transfer can already be finished or aborted. */
         transfer = NULL; batch = NULL;
         fibril_mutex_unlock(&ep->guard);
-
-        const uint8_t slot_id = xhci_dev->slot_id;
-        /* EP Doorbells start at 1 */
-        const uint8_t target = (xhci_endpoint_index(xhci_ep) + 1) | (batch->target.stream << 16);
-        hc_ring_doorbell(hc, slot_id, target);
         return EOK;
 }