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

Timestamp:

2011-04-17T19:17:55Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

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

new report structure fixes

File:

• uspace/lib/usb/src/pipes.c (modified) (6 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 */
@@ -241 +242 @@
  * necessary.
  *
+ * @deprecated
+ * Obsoleted with introduction of usb_pipe_start_long_transfer
+ *
  * @param pipe Endpoint pipe to start the session on.
  * @return Error code.
@@ -246 +250 @@
 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;
-
+        usb_log_warning("usb_pipe_start_session() was deprecated.\n");
         return EOK;
 }
@@ -265 +257 @@
 /** Ends a session on the endpoint pipe.
  *
+ * @deprecated
+ * Obsoleted with introduction of usb_pipe_end_long_transfer
+ *
  * @see usb_pipe_start_session
  *
@@ -272 +267 @@
 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;
-
+        usb_log_warning("usb_pipe_end_session() was deprecated.\n");
         return EOK;
 }
@@ -298 +281 @@
 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;
+}
+
+/** Prepare pipe for a long transfer.
+ *
+ * By a long transfer is mean transfer consisting of several
+ * requests to the HC.
+ * Calling such function is optional and it has positive effect of
+ * improved performance because IPC session is initiated only once.
+ *
+ * @param pipe Pipe over which the transfer will happen.
+ * @return Error code.
+ */
+int usb_pipe_start_long_transfer(usb_pipe_t *pipe)
+{
+        return pipe_add_ref(pipe);
+}
+
+/** Terminate a long transfer on a pipe.
+ *
+ * @see usb_pipe_start_long_transfer
+ *
+ * @param pipe Pipe where to end the long transfer.
+ */
+void usb_pipe_end_long_transfer(usb_pipe_t *pipe)
+{
+        pipe_drop_ref(pipe);
 }