Changeset 92b41f33 in mainline for uspace/lib/usb

Timestamp:

2011-03-13T22:54:33Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b711f62

Parents:

deb4ba7 (diff), 5fd22d8 (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:

Add library layer for bandwidth reservation

See ticket #121.

Location:

uspace/lib/usb

Files:

• include/usb/pipes.h (modified) (1 diff)
• src/devdrv.c (modified) (1 diff)
• src/pipesinit.c (modified) (2 diffs)

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

@@ -131 +131 @@
 int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);
-
+int usb_endpoint_pipe_register(usb_endpoint_pipe_t *, unsigned int,
+    usb_hc_connection_t *);
+int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *, usb_hc_connection_t *);
 
 int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *);

uspace/lib/usb/src/devdrv.c

@@ -155 +155 @@
         }
 
+        /* Register the endpoints. */
+        usb_hc_connection_t hc_conn;
+        rc = usb_hc_connection_initialize_from_device(&hc_conn, dev->ddf_dev);
+        if (rc != EOK) {
+                usb_log_error(
+                    "Failed initializing connection to host controller: %s.\n",
+                    str_error(rc));
+                goto rollback;
+        }
+        rc = usb_hc_connection_open(&hc_conn);
+        if (rc != EOK) {
+                usb_log_error("Failed to connect to host controller: %s.\n",
+                    str_error(rc));
+                goto rollback;
+        }
+        for (i = 0; i < pipe_count; i++) {
+                if (dev->pipes[i].present) {
+                        rc = usb_endpoint_pipe_register(dev->pipes[i].pipe,
+                            dev->pipes[i].descriptor->poll_interval,
+                            &hc_conn);
+                        /* Ignore error when operation not supported by HC. */
+                        if ((rc != EOK) && (rc != ENOTSUP)) {
+                                /* FIXME: what shall we do? */
+                                dev->pipes[i].present = false;
+                                free(dev->pipes[i].pipe);
+                                dev->pipes[i].pipe = NULL;
+                        }
+                }
+        }
+        /* Ignoring errors here. */
+        usb_hc_connection_close(&hc_conn);
+
         return EOK;
 

uspace/lib/usb/src/pipesinit.c

@@ -38 +38 @@
 #include <usb/dp.h>
 #include <usb/request.h>
+#include <usbhc_iface.h>
 #include <errno.h>
 #include <assert.h>
@@ -393 +394 @@
 }
 
+/** Register endpoint with the host controller.
+ *
+ * @param pipe Pipe to be registered.
+ * @param interval Polling interval.
+ * @param hc_connection Connection to the host controller (must be opened).
+ * @return Error code.
+ */
+int usb_endpoint_pipe_register(usb_endpoint_pipe_t *pipe,
+    unsigned int interval,
+    usb_hc_connection_t *hc_connection)
+{
+        assert(pipe);
+        assert(hc_connection);
+
+        if (!usb_hc_connection_is_opened(hc_connection)) {
+                return EBADF;
+        }
+
+#define _PACK(high, low) ((high) * 256 + (low))
+
+        return async_req_5_0(hc_connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_REGISTER_ENDPOINT,
+            _PACK(pipe->wire->address, pipe->endpoint_no),
+            _PACK(pipe->transfer_type, pipe->direction),
+            pipe->max_packet_size, interval);
+
+#undef _PACK
+}
+
+/** Revert endpoint registration with the host controller.
+ *
+ * @param pipe Pipe to be unregistered.
+ * @param hc_connection Connection to the host controller (must be opened).
+ * @return Error code.
+ */
+int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *pipe,
+    usb_hc_connection_t *hc_connection)
+{
+        assert(pipe);
+        assert(hc_connection);
+
+        if (!usb_hc_connection_is_opened(hc_connection)) {
+                return EBADF;
+        }
+
+        return async_req_4_0(hc_connection->hc_phone,
+            DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_UNREGISTER_ENDPOINT,
+            pipe->wire->address, pipe->endpoint_no, pipe->direction);
+}
+
 /**
  * @}