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

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

Files:

• ehci_bus.c (modified) (3 diffs)
• ehci_bus.h (modified) (1 diff)
• hc.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -43 +43 @@
 #include "hc.h"
 
-/** Callback to set toggle on ED.
+/**
+ * Callback to set toggle on ED.
  *
  * @param[in] hcd_ep hcd endpoint structure
  * @param[in] toggle new value of toggle bit
  */
-static void ehci_ep_toggle_reset(endpoint_t *ep)
+void ehci_ep_toggle_reset(endpoint_t *ep)
 {
         ehci_endpoint_t *instance = ehci_endpoint_get(ep);
@@ -54 +55 @@
                 usb_log_warning("EP(%p): Resetting toggle bit for transfer directed EP", instance);
         qh_toggle_set(instance->qh, 0);
-        ep->toggle = 0;
 }
 
@@ -169 +169 @@
         .interrupt = ehci_hc_interrupt,
         .status = ehci_hc_status,
+
         .endpoint_destroy = ehci_endpoint_destroy,
         .endpoint_create = ehci_endpoint_create,
         .endpoint_register = ehci_register_ep,
         .endpoint_unregister = ehci_unregister_ep,
-        .endpoint_toggle_reset = ehci_ep_toggle_reset,
         .endpoint_count_bw = bandwidth_count_usb20,
+
         .batch_create = ehci_create_batch,
         .batch_destroy = ehci_destroy_batch,

uspace/drv/bus/usb/ehci/ehci_bus.h

@@ -68 +68 @@
 } ehci_bus_t;
 
+void ehci_ep_toggle_reset(endpoint_t *);
 void ehci_bus_prepare_ops(void);
 

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

@@ -45 +45 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
+#include <usb/host/utility.h>
 
 #include "ehci_batch.h"
@@ -379 +380 @@
                                 list_remove(current);
                                 endpoint_del_ref(&ep->base);
+                                hc_reset_toggles(&batch->base, &ehci_ep_toggle_reset);
                                 usb_transfer_batch_finish(&batch->base);
                         }