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

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/ohci

Files:

• hc.c (modified) (2 diffs)
• hw_struct/endpoint_descriptor.c (modified) (1 diff)
• ohci_bus.c (modified) (2 diffs)
• ohci_bus.h (modified) (1 diff)

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

@@ -45 +45 @@
 
 #include <usb/debug.h>
+#include <usb/host/utility.h>
 #include <usb/usb.h>
 
@@ -377 +378 @@
                                 list_remove(current);
                                 endpoint_del_ref(&ep->base);
+                                hc_reset_toggles(&batch->base, &ohci_ep_toggle_reset);
                                 usb_transfer_batch_finish(&batch->base);
                         }

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

@@ -100 +100 @@
         OHCI_MEM32_WR(instance->td_head, pa & ED_TDHEAD_PTR_MASK);
         OHCI_MEM32_WR(instance->td_tail, pa & ED_TDTAIL_PTR_MASK);
-
-        /* Set toggle bit */
-        if (ep->toggle)
-                OHCI_MEM32_SET(instance->td_head, ED_TDHEAD_TOGGLE_CARRY);
-
 }
 /**

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

@@ -43 +43 @@
 #include "hc.h"
 
-/** Callback to reset toggle on ED.
+/**
+ * Callback to reset toggle on ED.
  *
  * @param[in] hcd_ep hcd endpoint structure
  * @param[in] toggle new value of toggle bit
  */
-static void ohci_ep_toggle_reset(endpoint_t *ep)
+void ohci_ep_toggle_reset(endpoint_t *ep)
 {
         ohci_endpoint_t *instance = ohci_endpoint_get(ep);
         assert(instance);
         assert(instance->ed);
-        ep->toggle = 0;
         ed_toggle_set(instance->ed, 0);
 }
@@ -179 +179 @@
         .endpoint_unregister = ohci_unregister_ep,
         .endpoint_count_bw = bandwidth_count_usb11,
-        .endpoint_toggle_reset = ohci_ep_toggle_reset,
+
         .batch_create = ohci_create_batch,
         .batch_destroy = ohci_destroy_batch,

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

@@ -65 +65 @@
 
 int ohci_bus_init(ohci_bus_t *, hc_t *);
+void ohci_ep_toggle_reset(endpoint_t *);
 
 /** Get and convert assigned ohci_endpoint_t structure