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

Timestamp:

2018-02-05T00:54:08Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

af16ebe

Parents:

65c059f

git-author:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:27:40)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-02-05 00:54:08)

Message:

usbhost: prepare buffers for transfers in library

File:

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

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

@@ -480 +480 @@
         xhci_isoch_t * const isoch = ep->isoch;
 
-        if (transfer->batch.buffer_size > ep->base.max_transfer_size) {
-                usb_log_error("Cannot schedule an oversized isochronous transfer.");
-                return ELIMIT;
-        }
+        /* This shall be already checked by endpoint */
+        assert(transfer->batch.buffer_size <= ep->base.max_transfer_size);
 
         fibril_mutex_lock(&isoch->guard);
@@ -524 +522 @@
         /* Prepare the transfer. */
         it->size = transfer->batch.buffer_size;
-        memcpy(it->data.virt, transfer->batch.buffer, it->size);
+        memcpy(it->data.virt, transfer->batch.dma_buffer.virt, it->size);
         it->state = ISOCH_FILLED;
 
@@ -573 +571 @@
         /* Withdraw results from previous transfer. */
         if (!it->error) {
-                memcpy(transfer->batch.buffer, it->data.virt, it->size);
+                memcpy(transfer->batch.dma_buffer.virt, it->data.virt, it->size);
                 transfer->batch.transferred_size = it->size;
                 transfer->batch.error = it->error;