Changeset 6b433a8 in mainline for uspace/drv/bus/usb/xhci/transfers.c

Timestamp:

2017-11-20T19:14:31Z (6 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

27b0ea0

Parents:

d3086873

Message:

Isochronous transfers - endpoint initialization

File:

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

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

@@ -287 +287 @@
         isoch_transfer->size = transfer->batch.buffer_size;
         if (isoch_transfer->size > 0) {
-                memcpy(isoch_transfer->data_virt, transfer->batch.buffer, isoch_transfer->size);
-        }
-
-        trb.parameter = isoch_transfer->data_phys;
+                memcpy(isoch_transfer->data.virt, transfer->batch.buffer, isoch_transfer->size);
+        }
+
+        trb.parameter = isoch_transfer->data.phys;
 
         xhci_trb_ring_t *ring = get_ring(hc, transfer);
@@ -341 +341 @@
         if (transfer->batch.buffer_size <= isoch_transfer->size) {
                 if (transfer->batch.buffer_size > 0) {
-                        memcpy(transfer->batch.buffer, isoch_transfer->data_virt, transfer->batch.buffer_size);
+                        memcpy(transfer->batch.buffer, isoch_transfer->data.virt, transfer->batch.buffer_size);
                 }
                 if (transfer->batch.buffer_size < isoch_transfer->size) {
@@ -349 +349 @@
         }
         else {
-                memcpy(transfer->batch.buffer, isoch_transfer->data_virt, isoch_transfer->size);
+                memcpy(transfer->batch.buffer, isoch_transfer->data.virt, isoch_transfer->size);
                 transfer->batch.transfered_size = isoch_transfer->size;
         }
@@ -357 +357 @@
         xhci_trb_clean(&trb);
 
-        trb.parameter = isoch_transfer->data_phys;
+        trb.parameter = isoch_transfer->data.phys;
         isoch_transfer->size = xhci_ep->isoch_max_size;