Changeset a546687 in mainline for uspace/lib/usb/src/pipes.c

Timestamp:

2011-04-09T09:17:22Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d48fcc0

Parents:

d5ac90f

Message:

Sessions started automatically on pipes

It is no longer necessary to call usb_pipe_start_session prior
reading or writing on a pipe.

File:

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

uspace/lib/usb/src/pipes.c

@@ -41 +41 @@
 #include <errno.h>
 #include <assert.h>
+#include "pipepriv.h"
 
 #define IPC_AGAIN_DELAY (1000 * 2) /* 2ms */
@@ -246 +247 @@
 int usb_pipe_start_session(usb_pipe_t *pipe)
 {
-        assert(pipe);
-
-        if (usb_pipe_is_session_started(pipe)) {
-                return EBUSY;
-        }
-
-        int phone = devman_device_connect(pipe->wire->hc_handle, 0);
-        if (phone < 0) {
-                return phone;
-        }
-
-        pipe->hc_phone = phone;
-
-        return EOK;
+        return pipe_add_ref(pipe);
 }
 
@@ -272 +260 @@
 int usb_pipe_end_session(usb_pipe_t *pipe)
 {
-        assert(pipe);
-
-        if (!usb_pipe_is_session_started(pipe)) {
-                return ENOENT;
-        }
-
-        int rc = async_hangup(pipe->hc_phone);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        pipe->hc_phone = -1;
-
+        pipe_drop_ref(pipe);
         return EOK;
 }
@@ -298 +274 @@
 bool usb_pipe_is_session_started(usb_pipe_t *pipe)
 {
-        return (pipe->hc_phone >= 0);
+        pipe_acquire(pipe);
+        bool started = pipe->refcount > 0;
+        pipe_release(pipe);
+        return started;
 }