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

Timestamp:

2011-04-09T09:17:22Z (14 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/pipesio.c (modified) (9 diffs)

uspace/lib/usb/src/pipesio.c

@@ -49 +49 @@
 #include <assert.h>
 #include <usbhc_iface.h>
-
-/** Ensure exclusive access to the IPC phone of given pipe.
- *
- * @param pipe Pipe to be exclusively accessed.
- */
-static void pipe_acquire(usb_pipe_t *pipe)
-{
-        fibril_mutex_lock(&pipe->hc_phone_mutex);
-}
-
-/** Terminate exclusive access to the IPC phone of given pipe.
- *
- * @param pipe Pipe to be released from exclusive usage.
- */
-static void pipe_release(usb_pipe_t *pipe)
-{
-        fibril_mutex_unlock(&pipe->hc_phone_mutex);
-}
-
-
+#include "pipepriv.h"
 
 /** Request an in transfer, no checking of input parameters.
@@ -176 +157 @@
 
         if (buffer == NULL) {
-                        return EINVAL;
+                return EINVAL;
         }
 
         if (size == 0) {
                 return EINVAL;
-        }
-
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
         }
 
@@ -195 +172 @@
         }
 
+        int rc;
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
+
         size_t act_size = 0;
-        int rc;
 
         rc = usb_pipe_read_no_checks(pipe, buffer, size, &act_size);
+
+        pipe_drop_ref(pipe);
+
         if (rc != EOK) {
                 return rc;
@@ -301 +287 @@
         }
 
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
-        }
-
         if (pipe->direction != USB_DIRECTION_OUT) {
                 return EBADF;
@@ -313 +295 @@
         }
 
-        int rc = usb_pipe_write_no_check(pipe, buffer, size);
+        int rc;
+
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_pipe_write_no_check(pipe, buffer, size);
+
+        pipe_drop_ref(pipe);
 
         return rc;
@@ -432 +423 @@
         }
 
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
-        }
-
         if ((pipe->direction != USB_DIRECTION_BOTH)
             || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
@@ -441 +428 @@
         }
 
+        int rc;
+
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
         size_t act_size = 0;
-        int rc = usb_pipe_control_read_no_check(pipe,
+        rc = usb_pipe_control_read_no_check(pipe,
             setup_buffer, setup_buffer_size,
             data_buffer, data_buffer_size, &act_size);
+
+        pipe_drop_ref(pipe);
 
         if (rc != EOK) {
@@ -556 +552 @@
         }
 
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
-        }
-
         if ((pipe->direction != USB_DIRECTION_BOTH)
             || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
@@ -565 +557 @@
         }
 
-        int rc = usb_pipe_control_write_no_check(pipe,
+        int rc;
+
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_pipe_control_write_no_check(pipe,
             setup_buffer, setup_buffer_size, data_buffer, data_buffer_size);
+
+        pipe_drop_ref(pipe);
 
         return rc;