Changeset fa0f53b in mainline

Timestamp:

2011-04-14T13:54:40Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

12b8e03

Parents:

5e168be1

Message:

Automatic endpoint halt clearing (#190)

To prevent total stall of endpoint 0, if some control read/write
function detects a stall, it automatically tries to clear it.

On real HW it works more or less fine, simulators does not always
handle stall condition correctly.

Location:

uspace/lib/usb

Files:

• include/usb/pipes.h (modified) (1 diff)
• src/pipesinit.c (modified) (2 diffs)
• src/pipesio.c (modified) (4 diffs)

uspace/lib/usb/include/usb/pipes.h

@@ -99 +99 @@
         /** Number of active transfers over the pipe. */
         int refcount;
+
+        /** Whether to automatically reset halt on the endpoint.
+         * Valid only for control endpoint zero.
+         */
+        bool auto_reset_halt;
 } usb_pipe_t;
 

uspace/lib/usb/src/pipesinit.c

@@ -365 +365 @@
         pipe->direction = direction;
         pipe->refcount = 0;
+        pipe->auto_reset_halt = false;
 
         return EOK;
@@ -385 +386 @@
             0, USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE,
             USB_DIRECTION_BOTH);
+
+        pipe->auto_reset_halt = true;
 
         return rc;

uspace/lib/usb/src/pipesio.c

@@ -49 +49 @@
 #include <assert.h>
 #include <usbhc_iface.h>
+#include <usb/request.h>
 #include "pipepriv.h"
 
@@ -307 +308 @@
 }
 
+/** Try to clear endpoint halt of default control pipe.
+ *
+ * @param pipe Pipe for control endpoint zero.
+ */
+static void clear_self_endpoint_halt(usb_pipe_t *pipe)
+{
+        assert(pipe != NULL);
+
+        if (!pipe->auto_reset_halt || (pipe->endpoint_no != 0)) {
+                return;
+        }
+
+
+        /* Prevent indefinite recursion. */
+        pipe->auto_reset_halt = false;
+        usb_request_clear_endpoint_halt(pipe, 0);
+        pipe->auto_reset_halt = true;
+}
+
 
 /** Request a control read transfer, no checking of input parameters.
@@ -436 +456 @@
             setup_buffer, setup_buffer_size,
             data_buffer, data_buffer_size, &act_size);
+
+        if (rc == ESTALL) {
+                clear_self_endpoint_halt(pipe);
+        }
 
         pipe_drop_ref(pipe);
@@ -563 +587 @@
             setup_buffer, setup_buffer_size, data_buffer, data_buffer_size);
 
+        if (rc == ESTALL) {
+                clear_self_endpoint_halt(pipe);
+        }
+
         pipe_drop_ref(pipe);