Changeset 2c2cbcf in mainline for uspace/lib/usb/src/pipepriv.c

Timestamp:

2011-04-17T10:46:16Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5ab4a48

Parents:

a91fbb1

Message:

usb_pipe_start_long_transfer returns void (#196)

File:

• uspace/lib/usb/src/pipepriv.c (modified) (3 diffs)

uspace/lib/usb/src/pipepriv.c

@@ -77 +77 @@
  *
  * @param pipe The USB pipe.
+ * @param hide_failure Whether to hide failure when adding reference
+ *      (use soft refcount).
  * @return Error code.
  * @retval EOK Currently always.
  */
-int pipe_add_ref(usb_pipe_t *pipe)
+int pipe_add_ref(usb_pipe_t *pipe, bool hide_failure)
 {
-another_try:
         pipe_acquire(pipe);
 
@@ -89 +90 @@
                 int phone = devman_device_connect(pipe->wire->hc_handle, 0);
                 if (phone < 0) {
-                        // TODO: treat some error as non-recoverable
-                        // and return error from here
+                        if (hide_failure) {
+                                pipe->refcount_soft++;
+                                phone = EOK;
+                        }
                         pipe_release(pipe);
-                        goto another_try;
+                        return phone;
                 }
                 /*
@@ -114 +117 @@
 {
         pipe_acquire(pipe);
+        if (pipe->refcount_soft > 0) {
+                pipe->refcount_soft--;
+                pipe_release(pipe);
+                return;
+        }
         assert(pipe->refcount > 0);
         pipe->refcount--;