Changes in uspace/lib/usb/src/pipes.c [e9ce696:3954a63b] in mainline

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 */
@@ -242 +241 @@
  * necessary.
  *
- * @deprecated
- * Obsoleted with introduction of usb_pipe_start_long_transfer
- *
  * @param pipe Endpoint pipe to start the session on.
  * @return Error code.
@@ -250 +246 @@
 int usb_pipe_start_session(usb_pipe_t *pipe)
 {
-        usb_log_warning("usb_pipe_start_session() was deprecated.\n");
+        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;
 }
@@ -257 +265 @@
 /** Ends a session on the endpoint pipe.
  *
- * @deprecated
- * Obsoleted with introduction of usb_pipe_end_long_transfer
- *
  * @see usb_pipe_start_session
  *
@@ -267 +272 @@
 int usb_pipe_end_session(usb_pipe_t *pipe)
 {
-        usb_log_warning("usb_pipe_end_session() was deprecated.\n");
+        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;
+
         return EOK;
 }
@@ -281 +298 @@
 bool usb_pipe_is_session_started(usb_pipe_t *pipe)
 {
-        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);
+        return (pipe->hc_phone >= 0);
 }