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

Timestamp:

2011-02-23T15:38:53Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

233e68d, a80849c

Parents:

eb1a2f4 (diff), d3880aa (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:

Merged small fixes and improvements

Fixed "usbinfo -t uhci" problem.

UHCI root hub prints less messages.

USB MID driver creates exposed "ctl" function (to provide at least
one function when interface drivers are not available).

File:

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

uspace/lib/usb/src/pipes.c

@@ -200 +200 @@
         assert(pipe);
 
-        if (pipe->hc_phone >= 0) {
+        if (usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBUSY;
         }
@@ -226 +226 @@
         assert(pipe);
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return ENOENT;
         }
@@ -238 +238 @@
 
         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);
 }