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

Timestamp:

2011-02-23T18:28:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e9e58ea3

Parents:

deece2f (diff), a9c674e0 (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:

Devel changes

File:

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

uspace/lib/usb/src/pipes.c

@@ -35 +35 @@
 #include <usb/usb.h>
 #include <usb/pipes.h>
+#include <usb/debug.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>
+#include <devman.h>
 #include <errno.h>
 #include <assert.h>
@@ -46 +48 @@
  * @return USB address or error code.
  */
-static usb_address_t get_my_address(int phone, device_t *dev)
+static usb_address_t get_my_address(int phone, ddf_dev_t *dev)
 {
         sysarg_t address;
+
+
+        /*
+         * We are sending special value as a handle - zero - to get
+         * handle of the parent function (that handle was used
+         * when registering our device @p dev.
+         */
         int rc = async_req_2_1(phone, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_ADDRESS,
-            dev->handle, &address);
+            0, &address);
 
         if (rc != EOK) {
@@ -65 +74 @@
  * @return Interface number (negative code means any).
  */
-int usb_device_get_assigned_interface(device_t *device)
+int usb_device_get_assigned_interface(ddf_dev_t *device)
 {
         int parent_phone = devman_parent_device_connect(device->handle,
@@ -94 +103 @@
  */
 int usb_device_connection_initialize_from_device(
-    usb_device_connection_t *connection, device_t *device)
+    usb_device_connection_t *connection, ddf_dev_t *dev)
 {
         assert(connection);
-        assert(device);
+        assert(dev);
 
         int rc;
@@ -103 +112 @@
         usb_address_t my_address;
 
-        rc = usb_hc_find(device->handle, &hc_handle);
+        rc = usb_hc_find(dev->handle, &hc_handle);
         if (rc != EOK) {
                 return rc;
         }
 
-        int parent_phone = devman_parent_device_connect(device->handle,
+        int parent_phone = devman_parent_device_connect(dev->handle,
             IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
@@ -114 +123 @@
         }
 
-        my_address = get_my_address(parent_phone, device);
+        my_address = get_my_address(parent_phone, dev);
         if (my_address < 0) {
                 rc = my_address;
@@ -191 +200 @@
         assert(pipe);
 
-        if (pipe->hc_phone >= 0) {
+        if (usb_endpoint_pipe_is_session_started(pipe)) {
                 return EBUSY;
         }
@@ -217 +226 @@
         assert(pipe);
 
-        if (pipe->hc_phone < 0) {
+        if (!usb_endpoint_pipe_is_session_started(pipe)) {
                 return ENOENT;
         }
@@ -229 +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);
 }