Changeset 9162b27 in mainline

Timestamp:

2017-11-20T22:15:11Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

375211d2

Parents:

27b0ea0

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-20 22:12:13)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-20 22:15:11)

Message:

ohci: fixed bugs introduced by refactoring

Location:

uspace/drv/bus/usb/ohci

Files:

• ohci_batch.c (modified) (9 diffs)
• ohci_batch.h (modified) (1 diff)

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

@@ -58 +58 @@
         if (ohci_batch->tds) {
                 const ohci_endpoint_t *ohci_ep =
-                    ohci_endpoint_get(ohci_batch->usb_batch->ep);
+                    ohci_endpoint_get(ohci_batch->base.ep);
                 assert(ohci_ep);
                 for (unsigned i = 0; i < ohci_batch->td_count; ++i) {
@@ -72 +72 @@
 /** Allocate memory and initialize internal data structure.
  *
- * @param[in] usb_batch Pointer to generic USB batch structure.
+ * @param[in] ep Endpoint for which the batch will be created
  * @return Valid pointer if all structures were successfully created,
  * NULL otherwise.
@@ -176 +176 @@
 
         usb_log_debug("Batch %p checking %zu td(s) for completion.\n",
-            ohci_batch->usb_batch, ohci_batch->td_count);
+            &ohci_batch->base, ohci_batch->td_count);
         usb_log_debug2("ED: %08x:%08x:%08x:%08x.\n",
             ohci_batch->ed->status, ohci_batch->ed->td_head,
@@ -218 +218 @@
                 } else {
                         usb_log_debug("Batch %p found error TD(%zu):%08x.\n",
-                            ohci_batch->usb_batch, i,
+                            &ohci_batch->base, i,
                             ohci_batch->tds[i]->status);
 
@@ -248 +248 @@
             ohci_batch->base.buffer_size);
 
+        const size_t setup_size = (ohci_batch->base.ep->transfer_type == USB_TRANSFER_CONTROL)
+                ? USB_SETUP_PACKET_SIZE
+                : 0;
+
         if (ohci_batch->base.dir == USB_DIRECTION_IN)
-                memcpy(ohci_batch->base.buffer, ohci_batch->device_buffer, ohci_batch->base.transfered_size);
+                memcpy(ohci_batch->base.buffer,
+                    ohci_batch->device_buffer + setup_size,
+                    ohci_batch->base.transfered_size);
 
         /* Store the remaining TD */
@@ -313 +319 @@
         /* Data stage */
         size_t td_current = 1;
-        size_t remain_size = ohci_batch->usb_batch->buffer_size;
+        size_t remain_size = ohci_batch->base.buffer_size;
         while (remain_size > 0) {
                 const size_t transfer_size =
@@ -345 +351 @@
         usb_log_debug2(
             "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
-            ohci_batch->usb_batch,
-            usb_str_transfer_type(ohci_batch->usb_batch->ep->transfer_type),
+            &ohci_batch->base,
+            usb_str_transfer_type(ohci_batch->base.ep->transfer_type),
             usb_str_direction(dir),
-            USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
+            USB_TRANSFER_BATCH_ARGS(ohci_batch->base));
 }
 
@@ -370 +376 @@
 
         size_t td_current = 0;
-        size_t remain_size = ohci_batch->usb_batch->buffer_size;
+        size_t remain_size = ohci_batch->base.buffer_size;
         char *buffer = ohci_batch->device_buffer;
         while (remain_size > 0) {
@@ -393 +399 @@
         usb_log_debug2(
             "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \
-            ohci_batch->usb_batch,
-            usb_str_transfer_type(ohci_batch->usb_batch->ep->transfer_type),
+            &ohci_batch->base,
+            usb_str_transfer_type(ohci_batch->base.ep->transfer_type),
             usb_str_direction(dir),
-            USB_TRANSFER_BATCH_ARGS(*ohci_batch->usb_batch));
+            USB_TRANSFER_BATCH_ARGS(ohci_batch->base));
 }
 

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

@@ -57 +57 @@
         /** Data buffer, must be accessible by the OHCI hw. */
         char *device_buffer;
-        /** Generic USB transfer structure */
-        usb_transfer_batch_t *usb_batch;
 } ohci_transfer_batch_t;