Changeset 77733a9 in mainline

Timestamp:

2018-01-27T13:35:46Z (6 years ago)

Author:

Salmelu <salmelu@…>

Branches:

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

Children:

80f7c54

Parents:

a94cbfa

Message:

libusbdev: removed unneeded isoch session

Location:

uspace/lib/usbdev

Files:

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

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

@@ -60 +60 @@
         /** 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

@@ -190 +190 @@
         }
 
-        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);
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
         const int rc =
@@ -230 +226 @@
         }
 
-        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);
-
+        async_exch_t *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) {
-
-        /*
-         * XXX: As parallel exhanges are implemented by using parallel sessions,
-         * it is safe to just take the same session. Once this won't be true,
-         * just use session cloning to clone the bus session.
-         */
-        pipe->isoch_session = pipe->bus_session;
-        return EOK;
 }
 
@@ -270 +244 @@
         pipe->auto_reset_halt = false;
         pipe->bus_session = bus_session;
-
-        if (transfer_type == USB_TRANSFER_ISOCHRONOUS)
-                return usb_isoch_session_initialize(pipe);
 
         return EOK;