Changeset e936e8e in mainline

Timestamp:

2011-02-22T14:31:09Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3b5d1535

Parents:

9f554e64

Message:

Add "is session started" function to the pipes API

Replaced direct querying of signess of hc_phone with this function.

Location:

uspace/lib/usb

Files:

• include/usb/pipes.h (modified) (1 diff)
• src/pipes.c (modified) (3 diffs)
• src/pipesio.c (modified) (4 diffs)

uspace/lib/usb/include/usb/pipes.h

@@ -137 +137 @@
 int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *);
 int usb_endpoint_pipe_end_session(usb_endpoint_pipe_t *);
+bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *);
 
 int usb_endpoint_pipe_read(usb_endpoint_pipe_t *, void *, size_t, size_t *);

uspace/lib/usb/src/pipes.c

@@ -191 +191 @@
         assert(pipe);
 
-        if (pipe->hc_phone >= 0) {
+        if (usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBUSY;
         }
@@ -217 +217 @@
         assert(pipe);
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return ENOENT;
         }
@@ -229 +229 @@
 
         return EOK;
+}
+
+/** Tell whether a session is started (open) on the endpoint pipe.
+ *
+ * The expected usage of this function is in assertions for some
+ * nested functions.
+ *
+ * @param pipe Endpoint pipe in question.
+ * @return Whether @p pipe has opened a session.
+ */
+bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *pipe)
+{
+        return (pipe->hc_phone >= 0);
 }
 

uspace/lib/usb/src/pipesio.c

@@ -148 +148 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }
@@ -255 +255 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }
@@ -369 +369 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }
@@ -481 +481 @@
         }
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBADF;
         }