Changes in uspace/lib/usb/src/pipesio.c [77223f8:2c2cbcf] in mainline

File:

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

uspace/lib/usb/src/pipesio.c

@@ -49 +49 @@
 #include <assert.h>
 #include <usbhc_iface.h>
+#include <usb/request.h>
 #include "pipepriv.h"
 
@@ -172 +173 @@
 
         int rc;
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -295 +296 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -305 +306 @@
 
         return rc;
+}
+
+/** 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;
 }
 
@@ -427 +447 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -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);
@@ -555 +579 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -563 +587 @@
             setup_buffer, setup_buffer_size, data_buffer, data_buffer_size);
 
+        if (rc == ESTALL) {
+                clear_self_endpoint_halt(pipe);
+        }
+
         pipe_drop_ref(pipe);