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

Timestamp:

2018-02-12T10:11:47Z (7 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/transfers.c (modified) (7 diffs)

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

@@ -126 +126 @@
 static int calculate_trb_count(xhci_transfer_t *transfer)
 {
-        const size_t size = transfer->batch.buffer_size;
+        const size_t size = transfer->batch.size;
         return (size + PAGE_SIZE - 1 )/ PAGE_SIZE;
 }
@@ -184 +184 @@
                 int stage_dir = REQUEST_TYPE_IS_DEVICE_TO_HOST(setup->request_type)
                                         ? STAGE_IN : STAGE_OUT;
-                size_t remaining = transfer->batch.buffer_size;
+                size_t remaining = transfer->batch.size;
 
                 for (size_t i = 0; i < buffer_count; ++i) {
@@ -227 +227 @@
                 const size_t buffer_count = calculate_trb_count(transfer);
                 xhci_trb_t trbs[buffer_count];
-                size_t remaining = transfer->batch.buffer_size;
+                size_t remaining = transfer->batch.size;
 
                 for (size_t i = 0; i < buffer_count; ++i) {
@@ -254 +254 @@
                 const size_t buffer_count = calculate_trb_count(transfer);
                 xhci_trb_t trbs[buffer_count + 1];
-                size_t remaining = transfer->batch.buffer_size;
+                size_t remaining = transfer->batch.size;
 
                 for (size_t i = 0; i < buffer_count; ++i) {
@@ -278 +278 @@
         const size_t buffer_count = calculate_trb_count(transfer);
         xhci_trb_t trbs[buffer_count];
-        size_t remaining = transfer->batch.buffer_size;
+        size_t remaining = transfer->batch.size;
 
         for (size_t i = 0; i < buffer_count; ++i) {
@@ -372 +372 @@
                 case XHCI_TRBC_SUCCESS:
                         batch->error = EOK;
-                        batch->transferred_size = batch->buffer_size - TRB_TRANSFER_LENGTH(*trb);
+                        batch->transferred_size = batch->size - TRB_TRANSFER_LENGTH(*trb);
                         break;
 
@@ -416 +416 @@
         }
 
-        assert(batch->transferred_size <= batch->buffer_size);
+        assert(batch->transferred_size <= batch->size);
 
         usb_transfer_batch_finish(batch);