Changeset 84a04dd in mainline for uspace/lib/usb/src/pipepriv.c

Timestamp:

2011-04-18T20:21:58Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44b1674, c7d19d84, da1dd48, e3f1987

Parents:

8595577b (diff), 4125b7d (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:

C-style, more IPC hiding (#196, #187)

Removed obsoleted usb_pipe_start_session() and
usb_pipe_end_session().

Printf-like functions produces warning with bad modifiers.

usb_pipe_start_long_transfer() is of type void to save-up checks
that would rarely fail (failure is received upon trying to communicate
over such pipe).

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