Changeset ba2fc2c in mainline

Timestamp:

2017-12-19T22:00:50Z (6 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

83fb72e

Parents:

0bb4738

Message:

usbdev: unique sessions for isochronous EPs

Location:

uspace/lib/usbdev

Files:

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

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

@@ -58 +58 @@
         /** The connection used for sending the data. */
         usb_dev_session_t *bus_session;
+        /** The session used for isochronous endpoints.
+         * Required as isochronous sends/receive can block the session.
+         */
+        usb_dev_session_t *isoch_session;
 } usb_pipe_t;
 

uspace/lib/usbdev/src/pipes.c

@@ -191 +191 @@
         }
 
-        /* Isochronous transfer are not supported (yet) */
-        if (pipe->desc.transfer_type != USB_TRANSFER_INTERRUPT &&
-            pipe->desc.transfer_type != USB_TRANSFER_BULK)
-            return ENOTSUP;
-
-        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        async_exch_t *exch;
+        if (pipe->desc.transfer_type == USB_TRANSFER_ISOCHRONOUS)
+                exch = async_exchange_begin(pipe->isoch_session);
+        else
+                exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
         const int rc =
@@ -232 +231 @@
         }
 
-        /* Isochronous transfer are not supported (yet) */
-        if (pipe->desc.transfer_type != USB_TRANSFER_INTERRUPT &&
-            pipe->desc.transfer_type != USB_TRANSFER_BULK)
-            return ENOTSUP;
-
-        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        async_exch_t *exch;
+        if (pipe->desc.transfer_type == USB_TRANSFER_ISOCHRONOUS)
+                exch = async_exchange_begin(pipe->isoch_session);
+        else
+                exch = async_exchange_begin(pipe->bus_session);
+
         const int rc = usbhc_write(exch, pipe->desc.endpoint_no, 0, buffer, size);
         async_exchange_end(exch);
         return rc;
+}
+
+/** Setup isochronous session for isochronous communication.
+ *  Isochronous endpoints need a different session as they might block while waiting for data.
+ *
+ * @param pipe Endpoint pipe being initialized.
+ * @return Error code.
+ */
+static int usb_isoch_session_initialize(usb_pipe_t *pipe) {
+        devman_handle_t handle;
+
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        if (!exch)
+                return EPARTY;
+
+        int ret = usb_get_my_device_handle(exch, &handle);
+
+        async_exchange_end(exch);
+        if (ret != EOK)
+                return ret;
+
+        pipe->isoch_session = usb_dev_connect(handle);
+        if (!pipe->isoch_session)
+                return ENAK;
+
+        return EOK;
 }
 
@@ -258 +283 @@
         unsigned mult, usb_dev_session_t *bus_session)
 {
+        int ret = EOK;
         // FIXME: refactor this function PLEASE
         assert(pipe);
@@ -273 +299 @@
         pipe->bus_session = bus_session;
 
-        return EOK;
+        if (transfer_type == USB_TRANSFER_ISOCHRONOUS) {
+                ret = usb_isoch_session_initialize(pipe);
+        }
+
+        return ret;
 }