Changeset df8f3fa in mainline

Timestamp:

2011-08-24T13:32:47Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5fe0a69

Parents:

31bc40e

Message:

Fix: only reset ep if the control transfer was sucessful.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/hcd.h (modified) (4 diffs)
• src/batch.c (modified) (2 diffs)
• src/iface.c (modified) (3 diffs)

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -41 +41 @@
 #include <usb/host/batch.h>
 #include <usbhc_iface.h>
-//#include <driver.h>
 
 typedef struct hcd hcd_t;
@@ -54 +53 @@
         void (*batch_private_dtor)(void *);
 };
-
+/*----------------------------------------------------------------------------*/
 static inline int hcd_init(hcd_t *hcd, size_t bandwidth)
 {
@@ -61 +60 @@
         return usb_endpoint_manager_init(&hcd->ep_manager, bandwidth);
 }
-
+/*----------------------------------------------------------------------------*/
+static inline void reset_ep_if_need(
+    hcd_t *hcd, usb_target_t target, const char* setup_data)
+{
+        assert(hcd);
+        usb_endpoint_manager_reset_if_need(
+            &hcd->ep_manager, target, (const uint8_t *)setup_data);
+}
+/*----------------------------------------------------------------------------*/
 static inline hcd_t * fun_to_hcd(ddf_fun_t *fun)
 {
@@ -67 +74 @@
         return fun->driver_data;
 }
-
+/*----------------------------------------------------------------------------*/
 extern usbhc_iface_t hcd_iface;
 

uspace/lib/usbhost/src/batch.c

@@ -38 +38 @@
 #include <usb/debug.h>
 #include <usb/host/batch.h>
+#include <usb/host/hcd.h>
 
 void usb_transfer_batch_call_in(usb_transfer_batch_t *instance);
@@ -150 +151 @@
             str_error(instance->error));
 
+        if (instance->ep->transfer_type == USB_TRANSFER_CONTROL
+            && instance->error == EOK) {
+                usb_target_t target =
+                    {instance->ep->address, instance->ep->endpoint};
+                reset_ep_if_need(
+                    fun_to_hcd(instance->fun), target, instance->setup_buffer);
+        }
+
         instance->callback_out(instance->fun,
             instance->error, instance->arg);

uspace/lib/usbhost/src/iface.c

@@ -117 +117 @@
         assert(address);
 
-        usb_log_debug("Address request with speed %d.\n", speed);
+        usb_log_debug("Address request speed: %s.\n", usb_str_speed(speed));
         *address = device_keeper_get_free_address(&hcd->dev_manager, speed);
         usb_log_debug("Address request with result: %d.\n", *address);
@@ -191 +191 @@
             usb_device_keeper_get_speed(&hcd->dev_manager, address);
         if (speed >= USB_SPEED_MAX) {
+                // Does this happen?
                 speed = ep_speed;
         }
@@ -306 +307 @@
         return send_batch(fun, target, USB_DIRECTION_BOTH, data, size,
             setup_data, setup_size, NULL, callback, arg, "Control WRITE");
-//      usb_endpoint_manager_reset_if_need(&hc->ep_manager, target, setup_data);
 }
 /*----------------------------------------------------------------------------*/