Changeset c7dd69d in mainline for uspace/lib/usb/src/pipesio.c

Timestamp:

2011-04-15T13:19:59Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

da1dd48

Parents:

e3b5129 (diff), 8fd4ba0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development changes

File:

• uspace/lib/usb/src/pipesio.c (modified) (4 diffs)

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);