Changeset c6f82e5 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2018-01-19T20:56:14Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7ec7b7e

Parents:

69b2dfee

Message:

libusbhost: do not try to handle the toggle bit in a generic way

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.h (modified) (1 diff)
• transfer_list.c (modified) (3 diffs)
• uhci_batch.c (modified) (5 diffs)

uspace/drv/bus/usb/uhci/hc.h

@@ -127 +127 @@
 } hc_t;
 
+typedef struct uhci_endpoint {
+        endpoint_t base;
+
+        bool toggle;
+} uhci_endpoint_t;
+
 static inline hc_t *hcd_to_hc(hc_device_t *hcd)
 {

uspace/drv/bus/usb/uhci/transfer_list.c

@@ -41 +41 @@
 #include <usb/host/usb_transfer_batch.h>
 #include <usb/host/utils/malloc32.h>
+#include <usb/host/utility.h>
 
 #include "hw_struct/link_pointer.h"
 #include "transfer_list.h"
+#include "hc.h"
 
 /** Initialize transfer list structures.
@@ -155 +157 @@
 }
 
+/**
+ * Reset toggle on endpoint callback.
+ */
+static void uhci_reset_toggle(endpoint_t *ep)
+{
+        uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) ep;
+        uhci_ep->toggle = 0;
+}
+
 /** Add completed batches to the provided list.
  *
@@ -176 +187 @@
                         fibril_mutex_lock(&batch->base.ep->guard);
                         assert(batch->base.ep->active_batch == &batch->base);
+                        hc_reset_toggles(&batch->base, &uhci_reset_toggle);
                         endpoint_deactivate_locked(batch->base.ep);
                         transfer_list_remove_batch(instance, batch);

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -46 +46 @@
 
 #include "uhci_batch.h"
+#include "hc.h"
 #include "hw_struct/transfer_descriptor.h"
 
@@ -164 +165 @@
         batch->transfered_size = 0;
 
+        uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) batch->ep;
+
         for (size_t i = 0;i < uhci_batch->td_count; ++i) {
                 if (td_is_active(&uhci_batch->tds[i])) {
@@ -178 +181 @@
                         td_print_status(&uhci_batch->tds[i]);
 
-                        batch->ep->toggle = td_toggle(&uhci_batch->tds[i]);
+                        uhci_ep->toggle = td_toggle(&uhci_batch->tds[i]);
                         goto substract_ret;
                 }
@@ -230 +233 @@
         const size_t mps = uhci_batch->base.ep->max_packet_size;
 
-        int toggle = uhci_batch->base.ep->toggle;
+        uhci_endpoint_t *uhci_ep = (uhci_endpoint_t *) uhci_batch->base.ep;
+
+        int toggle = uhci_ep->toggle;
         assert(toggle == 0 || toggle == 1);
 
@@ -254 +259 @@
         }
         td_set_ioc(&uhci_batch->tds[td - 1]);
-        uhci_batch->base.ep->toggle = toggle;
+        uhci_ep->toggle = toggle;
         usb_log_debug2(
             "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.", \