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

File:

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

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/dev/request.h>
 #include <usb/usb.h>
-#include <usbhc_iface.h>
+#include <usb_iface.h>
 
 #include <assert.h>
@@ -51 +51 @@
         assert(pipe != NULL);
 
-        if (!pipe->auto_reset_halt || (pipe->desc.endpoint_no != 0)) {
+        if (!pipe->auto_reset_halt || (pipe->endpoint_no != 0)) {
                 return;
         }
@@ -88 +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;
         }
@@ -98 +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);
@@ -142 +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;
         }
@@ -151 +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);
 
@@ -183 +183 @@
         }
 
-        if (pipe->desc.direction != USB_DIRECTION_IN) {
-                return EBADF;
-        }
-
-        if (pipe->desc.transfer_type == USB_TRANSFER_CONTROL) {
+        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->desc.transfer_type != USB_TRANSFER_INTERRUPT &&
-            pipe->desc.transfer_type != USB_TRANSFER_BULK)
+        if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+            pipe->transfer_type != USB_TRANSFER_BULK)
             return ENOTSUP;
 
@@ -199 +199 @@
         size_t act_size = 0;
         const int rc =
-            usbhc_read(exch, pipe->desc.endpoint_no, 0, buffer, size, &act_size);
+            usb_read(exch, pipe->endpoint_no, 0, buffer, size, &act_size);
         async_exchange_end(exch);
 
@@ -224 +224 @@
         }
 
-        if (pipe->desc.direction != USB_DIRECTION_OUT) {
-                return EBADF;
-        }
-
-        if (pipe->desc.transfer_type == USB_TRANSFER_CONTROL) {
+        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->desc.transfer_type != USB_TRANSFER_INTERRUPT &&
-            pipe->desc.transfer_type != USB_TRANSFER_BULK)
+        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 = usbhc_write(exch, pipe->desc.endpoint_no, 0, buffer, size);
+        const int rc = usb_write(exch, pipe->endpoint_no, 0, buffer, size);
         async_exchange_end(exch);
         return rc;
@@ -254 +254 @@
 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,
-    unsigned max_burst, unsigned max_streams, usb_dev_session_t *bus_session)
-{
-        // FIXME refactor this function
-        assert(pipe);
-
-        pipe->desc.endpoint_no = endpoint_no;
-        pipe->desc.transfer_type = transfer_type;
-        pipe->desc.packets = packets;
-        pipe->desc.max_packet_size = max_packet_size;
-        pipe->desc.direction = direction;
-        pipe->desc.usb3.max_burst = max_burst;
-        pipe->desc.usb3.max_streams = max_streams;
+    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;
@@ -284 +280 @@
 
         const int rc = usb_pipe_initialize(pipe, 0, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, 1, 0, 0, bus_session);
+            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH, 1, bus_session);
 
         pipe->auto_reset_halt = true;
@@ -301 +297 @@
         assert(pipe);
         assert(pipe->bus_session);
-
-        pipe->desc.usb2.polling_interval = interval;
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         if (!exch)
                 return ENOMEM;
-
-        const int ret = usbhc_register_endpoint(exch, &pipe->desc);
-
+        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;
@@ -325 +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;