Changeset 1d758fc in mainline for uspace/drv/bus/usb/xhci/isoch.c

Timestamp:

2018-02-12T10:11:47Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5fe3f954

Parents:

2f762a7

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)

Message:

usb: rethinking DMA buffers

File:

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

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

@@ -176 +176 @@
         xhci_trb_clean(&trb);
 
-        trb.parameter = it->data.phys;
+        trb.parameter = host2xhci(64, dma_buffer_phys_base(&it->data));
         TRB_CTRL_SET_XFER_LEN(trb, it->size);
         TRB_CTRL_SET_TD_SIZE(trb, 0);
@@ -481 +481 @@
 
         /* This shall be already checked by endpoint */
-        assert(transfer->batch.buffer_size <= ep->base.max_transfer_size);
+        assert(transfer->batch.size <= ep->base.max_transfer_size);
 
         fibril_mutex_lock(&isoch->guard);
@@ -521 +521 @@
 
         /* Prepare the transfer. */
-        it->size = transfer->batch.buffer_size;
+        it->size = transfer->batch.size;
         memcpy(it->data.virt, transfer->batch.dma_buffer.virt, it->size);
         it->state = ISOCH_FILLED;
@@ -544 +544 @@
         xhci_isoch_t * const isoch = ep->isoch;
 
-        if (transfer->batch.buffer_size < ep->base.max_transfer_size) {
+        if (transfer->batch.size < ep->base.max_transfer_size) {
                 usb_log_error("Cannot schedule an undersized isochronous transfer.");
                 return ELIMIT;