Changes in uspace/lib/usbdev/src/pipes.c [bb655dab:58563585] in mainline

File:

• uspace/lib/usbdev/src/pipes.c (modified) (16 diffs)

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/dev/request.h>
 #include <usb/usb.h>
+#include <usb_iface.h>
 
 #include <assert.h>
@@ -50 +51 @@
         assert(pipe != NULL);
 
-        if (!pipe->auto_reset_halt || (pipe->desc.endpoint_no != 0)) {
+        if (!pipe->auto_reset_halt || (pipe->endpoint_no != 0)) {
                 return;
         }
@@ -56 +57 @@
         /* Prevent infinite recursion. */
         pipe->auto_reset_halt = false;
-        usb_pipe_clear_halt(pipe, pipe);
+        usb_request_clear_endpoint_halt(pipe, 0);
         pipe->auto_reset_halt = true;
 }
@@ -69 +70 @@
  * @param[out] data_buffer Buffer for incoming data.
  * @param[in] data_buffer_size Size of the buffer for incoming data (in bytes).
- * @param[out] data_transferred_size Number of bytes that were actually
- *                                  transferred during the DATA stage.
+ * @param[out] data_transfered_size Number of bytes that were actually
+ *                                  transfered during the DATA stage.
  * @return Error code.
  */
 int usb_pipe_control_read(usb_pipe_t *pipe,
     const void *setup_buffer, size_t setup_buffer_size,
-    void *buffer, size_t buffer_size, size_t *transferred_size)
+    void *buffer, size_t buffer_size, size_t *transfered_size)
 {
         assert(pipe);
@@ -87 +88 @@
         }
 
-        if ((pipe->desc.direction != USB_DIRECTION_BOTH)
-            || (pipe->desc.transfer_type != USB_TRANSFER_CONTROL)) {
+        if ((pipe->direction != USB_DIRECTION_BOTH)
+            || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
                 return EBADF;
         }
@@ -97 +98 @@
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
-        const int rc = usbhc_read(exch, pipe->desc.endpoint_no, setup_packet, buffer,
+        const int rc = usb_read(exch, pipe->endpoint_no, setup_packet, buffer,
             buffer_size, &act_size);
         async_exchange_end(exch);
@@ -105 +106 @@
         }
 
-        if (rc == EOK && transferred_size != NULL) {
-                *transferred_size = act_size;
+        if (rc == EOK && transfered_size != NULL) {
+                *transfered_size = act_size;
         }
 
@@ -141 +142 @@
         }
 
-        if ((pipe->desc.direction != USB_DIRECTION_BOTH)
-            || (pipe->desc.transfer_type != USB_TRANSFER_CONTROL)) {
+        if ((pipe->direction != USB_DIRECTION_BOTH)
+            || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
                 return EBADF;
         }
@@ -150 +151 @@
 
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
-        const int rc = usbhc_write(exch,
-            pipe->desc.endpoint_no, setup_packet, buffer, buffer_size);
+        const int rc = usb_write(exch,
+            pipe->endpoint_no, setup_packet, buffer, buffer_size);
         async_exchange_end(exch);
 
@@ -166 +167 @@
  * @param[out] buffer Buffer where to store the data.
  * @param[in] size Size of the buffer (in bytes).
- * @param[out] size_transferred Number of bytes that were actually transferred.
+ * @param[out] size_transfered Number of bytes that were actually transfered.
  * @return Error code.
  */
 int usb_pipe_read(usb_pipe_t *pipe,
-    void *buffer, size_t size, size_t *size_transferred)
+    void *buffer, size_t size, size_t *size_transfered)
 {
         assert(pipe);
@@ -182 +183 @@
         }
 
-        if (pipe->desc.direction != USB_DIRECTION_IN) {
-                return EBADF;
-        }
-
-        if (pipe->desc.transfer_type == USB_TRANSFER_CONTROL) {
-                return EBADF;
-        }
+        if (pipe->direction != USB_DIRECTION_IN) {
+                return EBADF;
+        }
+
+        if (pipe->transfer_type == USB_TRANSFER_CONTROL) {
+                return EBADF;
+        }
+
+        /* Isochronous transfer are not supported (yet) */
+        if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+            pipe->transfer_type != USB_TRANSFER_BULK)
+            return ENOTSUP;
 
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
         const int rc =
-            usbhc_read(exch, pipe->desc.endpoint_no, 0, buffer, size, &act_size);
-        async_exchange_end(exch);
-
-        if (rc == EOK && size_transferred != NULL) {
-                *size_transferred = act_size;
+            usb_read(exch, pipe->endpoint_no, 0, buffer, size, &act_size);
+        async_exchange_end(exch);
+
+        if (rc == EOK && size_transfered != NULL) {
+                *size_transfered = act_size;
         }
 
@@ -218 +224 @@
         }
 
-        if (pipe->desc.direction != USB_DIRECTION_OUT) {
-                return EBADF;
-        }
-
-        if (pipe->desc.transfer_type == USB_TRANSFER_CONTROL) {
-                return EBADF;
-        }
-
-        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
-        const int rc = usbhc_write(exch, pipe->desc.endpoint_no, 0, buffer, size);
+        if (pipe->direction != USB_DIRECTION_OUT) {
+                return EBADF;
+        }
+
+        if (pipe->transfer_type == USB_TRANSFER_CONTROL) {
+                return EBADF;
+        }
+
+        /* Isochronous transfer are not supported (yet) */
+        if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+            pipe->transfer_type != USB_TRANSFER_BULK)
+            return ENOTSUP;
+
+        async_exch_t *exch = async_exchange_begin(pipe->bus_session);
+        const int rc = usb_write(exch, pipe->endpoint_no, 0, buffer, size);
         async_exchange_end(exch);
         return rc;
@@ -235 +246 @@
  *
  * @param pipe Endpoint pipe to be initialized.
- * @param bus_session Endpoint pipe to be initialized.
- * @return Error code.
- */
-int usb_pipe_initialize(usb_pipe_t *pipe, usb_dev_session_t *bus_session)
-{
-        assert(pipe);
-
+ * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15).
+ * @param transfer_type Transfer type (e.g. interrupt or bulk).
+ * @param max_packet_size Maximum packet size in bytes.
+ * @param direction Endpoint direction (in/out).
+ * @return Error code.
+ */
+int usb_pipe_initialize(usb_pipe_t *pipe, usb_endpoint_t endpoint_no,
+    usb_transfer_type_t transfer_type, size_t max_packet_size,
+    usb_direction_t direction, unsigned packets, usb_dev_session_t *bus_session)
+{
+        assert(pipe);
+
+        pipe->endpoint_no = endpoint_no;
+        pipe->transfer_type = transfer_type;
+        pipe->packets = packets;
+        pipe->max_packet_size = max_packet_size;
+        pipe->direction = direction;
         pipe->auto_reset_halt = false;
         pipe->bus_session = bus_session;
@@ -248 +269 @@
 }
 
-static const usb_pipe_desc_t default_control_pipe = {
-        .endpoint_no = 0,
-        .transfer_type = USB_TRANSFER_CONTROL,
-        .direction = USB_DIRECTION_BOTH,
-        .max_transfer_size = CTRL_PIPE_MIN_PACKET_SIZE,
-};
-
-/** Initialize USB default control pipe.
- *
- * This one is special because it must not be registered, it is registered automatically.
+/** Initialize USB endpoint pipe as the default zero control pipe.
  *
  * @param pipe Endpoint pipe to be initialized.
- * @param bus_session Endpoint pipe to be initialized.
- * @return Error code.
- */
-int usb_pipe_initialize_default_control(usb_pipe_t *pipe, usb_dev_session_t *bus_session)
-{
-        const int ret = usb_pipe_initialize(pipe, bus_session);
-        if (ret)
-                return ret;
-
-        pipe->desc = default_control_pipe;
+ * @return Error code.
+ */
+int usb_pipe_initialize_default_control(usb_pipe_t *pipe,
+    usb_dev_session_t *bus_session)
+{
+        assert(pipe);
+
+        const int rc = usb_pipe_initialize(pipe, 0, USB_TRANSFER_CONTROL,
+            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, 1, bus_session);
+
         pipe->auto_reset_halt = true;
 
-        return EOK;
+        return rc;
 }
 
@@ -278 +290 @@
  *
  * @param pipe Pipe to be registered.
- * @param ep_desc Matched endpoint descriptor
- * @param comp_desc Matched superspeed companion descriptro, if any
- * @return Error code.
- */
-int usb_pipe_register(usb_pipe_t *pipe, const usb_standard_endpoint_descriptor_t *ep_desc, const usb_superspeed_endpoint_companion_descriptor_t *comp_desc)
+ * @param interval Polling interval.
+ * @return Error code.
+ */
+int usb_pipe_register(usb_pipe_t *pipe, unsigned interval)
 {
         assert(pipe);
         assert(pipe->bus_session);
-        assert(ep_desc);
-
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         if (!exch)
                 return ENOMEM;
-
-        usb_endpoint_descriptors_t descriptors;
-
-#define COPY(field) descriptors.endpoint.field = ep_desc->field
-        COPY(endpoint_address);
-        COPY(attributes);
-        COPY(max_packet_size);
-        COPY(poll_interval);
-#undef COPY
-
-#define COPY(field) descriptors.companion.field = comp_desc->field
-        if (comp_desc) {
-                COPY(max_burst);
-                COPY(attributes);
-                COPY(bytes_per_interval);
-        }
-#undef COPY
-
-        const int ret = usbhc_register_endpoint(exch, &pipe->desc, &descriptors);
+        const int ret = usb_register_endpoint(exch, pipe->endpoint_no,
+            pipe->transfer_type, pipe->direction, pipe->max_packet_size,
+            pipe->packets, interval);
         async_exchange_end(exch);
         return ret;
@@ -326 +319 @@
         if (!exch)
                 return ENOMEM;
-
-        const int ret = usbhc_unregister_endpoint(exch, &pipe->desc);
-
+        const int ret = usb_unregister_endpoint(exch, pipe->endpoint_no,
+            pipe->direction);
         async_exchange_end(exch);
         return ret;