Changeset 816f5f4 in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2017-10-15T16:55:48Z (8 years ago)

Author:

Michal Staruch <salmelu@…>

Branches:

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

Children:

9b2f69e

Parents:

2770b66

Message:

Remote USB (async) sending structures

remote_usb_register_endpoint is now sending a whole new structure, instead of 5 numeric arguments pulled out of structure.
This allows future extensibility for the structure as well as a working code to be used for other remote async calls.

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (3 diffs)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -86 +86 @@
 /** Register endpoint interface function.
  * @param fun DDF function.
- * @param address USB address of the device.
- * @param endpoint USB endpoint number to be registered.
- * @param transfer_type Endpoint's transfer type.
- * @param direction USB communication direction the endpoint is capable of.
- * @param max_packet_size Maximu size of packets the endpoint accepts.
- * @param interval Preferred timeout between communication.
+ * @param endpoint_desc Endpoint description.
  * @return Error code.
  */
 static int register_endpoint(
-    ddf_fun_t *fun, usb_endpoint_t endpoint,
-    usb_transfer_type_t transfer_type, usb_direction_t direction,
-    size_t max_packet_size, unsigned packets, unsigned interval)
+        ddf_fun_t *fun, usb_endpoint_desc_t *endpoint_desc)
 {
         assert(fun);
@@ -105 +98 @@
         assert(hcd->bus);
         assert(dev);
-        const size_t size = max_packet_size;
+
+        const size_t size = endpoint_desc->max_packet_size;
 
         usb_log_debug("Register endpoint %d:%d %s-%s %zuB %ums.\n",
-            dev->address, endpoint, usb_str_transfer_type(transfer_type),
-            usb_str_direction(direction), max_packet_size, interval);
-
-        return bus_add_ep(hcd->bus, dev, endpoint, direction, transfer_type,
-            max_packet_size, packets, size);
-}
-
-/** Unregister endpoint interface function.
- * @param fun DDF function.
- * @param address USB address of the endpoint.
- * @param endpoint USB endpoint number.
- * @param direction Communication direction of the enpdoint to unregister.
- * @return Error code.
- */
+                dev->address, endpoint_desc->endpoint_no,
+                usb_str_transfer_type(endpoint_desc->transfer_type),
+                usb_str_direction(endpoint_desc->direction),
+                endpoint_desc->max_packet_size, endpoint_desc->usb2.polling_interval);
+
+        return bus_add_ep(hcd->bus, dev, endpoint_desc->endpoint_no,
+                endpoint_desc->direction, endpoint_desc->transfer_type,
+                endpoint_desc->max_packet_size, endpoint_desc->packets,
+                size);
+}
+
+ /** Unregister endpoint interface function.
+  * @param fun DDF function.
+  * @param endpoint_desc Endpoint description.
+  * @return Error code.
+  */
 static int unregister_endpoint(
-    ddf_fun_t *fun, usb_endpoint_t endpoint, usb_direction_t direction)
+        ddf_fun_t *fun, usb_endpoint_desc_t *endpoint_desc)
 {
         assert(fun);
@@ -131 +127 @@
         assert(hcd->bus);
         assert(dev);
+
         const usb_target_t target = {{
                 .address = dev->address,
-                .endpoint = endpoint
+                .endpoint = endpoint_desc->endpoint_no
         }};
+
         usb_log_debug("Unregister endpoint %d:%d %s.\n",
-            dev->address, endpoint, usb_str_direction(direction));
-        return bus_remove_ep(hcd->bus, target, direction);
+                dev->address, endpoint_desc->endpoint_no,
+                usb_str_direction(endpoint_desc->direction));
+        return bus_remove_ep(hcd->bus, target, endpoint_desc->direction);
 }