Changeset 2c2cbcf in mainline for uspace/lib/usb/src

Timestamp:

2011-04-17T10:46:16Z (14 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)

Location:

uspace/lib/usb/src

Files:

• devdrv.c (modified) (1 diff)
• pipepriv.c (modified) (3 diffs)
• pipepriv.h (modified) (2 diffs)
• pipes.c (modified) (1 diff)
• pipesinit.c (modified) (2 diffs)
• pipesio.c (modified) (4 diffs)

uspace/lib/usb/src/devdrv.c

@@ -236 +236 @@
 
         /* It is worth to start a long transfer. */
-        rc = usb_pipe_start_long_transfer(ctrl_pipe);
-        if (rc != EOK) {
-                return rc;
-        }
+        usb_pipe_start_long_transfer(ctrl_pipe);
 
         /* Get the device descriptor. */

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

uspace/lib/usb/src/pipepriv.h

@@ -37 +37 @@
 
 #include <usb/pipes.h>
+#include <bool.h>
 
 void pipe_acquire(usb_pipe_t *);
@@ -44 +45 @@
 void pipe_end_transaction(usb_pipe_t *);
 
-int pipe_add_ref(usb_pipe_t *);
+int pipe_add_ref(usb_pipe_t *, bool);
 void pipe_drop_ref(usb_pipe_t *);
 

uspace/lib/usb/src/pipes.c

@@ -297 +297 @@
  * @return Error code.
  */
-int usb_pipe_start_long_transfer(usb_pipe_t *pipe)
-{
-        return pipe_add_ref(pipe);
+void usb_pipe_start_long_transfer(usb_pipe_t *pipe)
+{
+        (void) pipe_add_ref(pipe, true);
 }
 

uspace/lib/usb/src/pipesinit.c

@@ -365 +365 @@
         pipe->direction = direction;
         pipe->refcount = 0;
+        pipe->refcount_soft = 0;
         pipe->auto_reset_halt = false;
 
@@ -419 +420 @@
         int rc;
 
-        rc = usb_pipe_start_long_transfer(pipe);
-        if (rc != EOK) {
-                return rc;
-        }
-
+        usb_pipe_start_long_transfer(pipe);
 
         uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];

uspace/lib/usb/src/pipesio.c

@@ -173 +173 @@
 
         int rc;
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -296 +296 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -447 +447 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;
@@ -579 +579 @@
         int rc;
 
-        rc = pipe_add_ref(pipe);
+        rc = pipe_add_ref(pipe, false);
         if (rc != EOK) {
                 return rc;