Changeset c21e6a5 in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2018-02-05T00:54:08Z (7 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/ohci/ohci_batch.c (modified) (7 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -113 +113 @@
                 : 0;
 
-        if (dma_buffer_alloc(&ohci_batch->ohci_dma_buffer, td_size + setup_size + usb_batch->buffer_size)) {
+        if (dma_buffer_alloc(&ohci_batch->ohci_dma_buffer, td_size + setup_size)) {
                 usb_log_error("Failed to allocate OHCI DMA buffer.");
                 return ENOMEM;
@@ -129 +129 @@
         memcpy(ohci_batch->setup_buffer, usb_batch->setup.buffer, setup_size);
 
-        ohci_batch->data_buffer = ohci_batch->setup_buffer + setup_size;
-        if (usb_batch->dir == USB_DIRECTION_OUT)
-                memcpy(ohci_batch->data_buffer, usb_batch->buffer, usb_batch->buffer_size);
+        ohci_batch->data_buffer = usb_batch->dma_buffer.virt;
 
         batch_setup[usb_batch->ep->transfer_type](ohci_batch);
@@ -151 +149 @@
         assert(ohci_batch);
 
-        ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ohci_batch->base.ep);
+        usb_transfer_batch_t *usb_batch = &ohci_batch->base;
+        ohci_endpoint_t *ohci_ep = ohci_endpoint_get(usb_batch->ep);
         assert(ohci_ep);
 
         usb_log_debug("Batch %p checking %zu td(s) for completion.",
-            &ohci_batch->base, ohci_batch->td_count);
+            ohci_batch, ohci_batch->td_count);
         usb_log_debug2("ED: %08x:%08x:%08x:%08x.",
             ohci_ep->ed->status, ohci_ep->ed->td_head,
@@ -167 +166 @@
 
         /* Assume all data got through */
-        ohci_batch->base.transferred_size = ohci_batch->base.buffer_size;
+        usb_batch->transferred_size = usb_batch->buffer_size;
 
         /* Check all TDs */
@@ -176 +175 @@
                     ohci_batch->tds[i]->next, ohci_batch->tds[i]->be);
 
-                ohci_batch->base.error = td_error(ohci_batch->tds[i]);
-                if (ohci_batch->base.error == EOK) {
+                usb_batch->error = td_error(ohci_batch->tds[i]);
+                if (usb_batch->error == EOK) {
                         /* If the TD got all its data through, it will report
                          * 0 bytes remain, the sole exception is INPUT with
@@ -190 +189 @@
                          * we leave the very last(unused) TD behind.
                          */
-                        ohci_batch->base.transferred_size
+                        usb_batch->transferred_size
                             -= td_remain_size(ohci_batch->tds[i]);
                 } else {
                         usb_log_debug("Batch %p found error TD(%zu):%08x.",
-                            &ohci_batch->base, i, ohci_batch->tds[i]->status);
+                            ohci_batch, i, ohci_batch->tds[i]->status);
 
                         /* ED should be stopped because of errors */
@@ -213 +212 @@
                 }
         }
-        assert(ohci_batch->base.transferred_size <=
-            ohci_batch->base.buffer_size);
-
-        if (ohci_batch->base.dir == USB_DIRECTION_IN)
-                memcpy(ohci_batch->base.buffer,
-                    ohci_batch->data_buffer,
-                    ohci_batch->base.transferred_size);
+        assert(usb_batch->transferred_size <= usb_batch->buffer_size);
 
         /* Make sure that we are leaving the right TD behind */