Changeset 327f147 in mainline for uspace/lib/usbhost/src/ddf_helpers.c

Timestamp:

2017-10-23T19:03:37Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

b724494

Parents:

e160bfe8

Message:

usbhost: change parameters of methods

Pass (device_t, usb_target_t) to read and write, which finally allows to drop hash tables and access device right away. Then, all callbacks to complete transfer now uses usb_transfer_batch. This requires libdrv to include libusbhost, but it is not linked against it - it is there only to share definition of usb_transfer_batch_t.

File:

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

uspace/lib/usbhost/src/ddf_helpers.c

@@ -135 +135 @@
                 dev->address, endpoint_desc->endpoint_no,
                 usb_str_direction(endpoint_desc->direction));
-        return bus_remove_ep(hcd->bus, target, endpoint_desc->direction);
+        return bus_remove_ep(hcd->bus, dev, target, endpoint_desc->direction);
 }
 
@@ -216 +216 @@
  * @return Error code.
  */
-static int dev_read(ddf_fun_t *fun, usb_endpoint_t endpoint,
-    uint64_t setup_data, uint8_t *data, size_t size,
-    usbhc_iface_transfer_in_callback_t callback, void *arg)
+static int dev_read(ddf_fun_t *fun, usb_target_t target,
+    uint64_t setup_data, char *data, size_t size,
+    usb_iface_transfer_callback_t callback, void *arg)
 {
         assert(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         device_t *dev = ddf_fun_data_get(fun);
         assert(dev);
-        const usb_target_t target = {{
-            .address  = dev->address,
-            .endpoint = endpoint,
-        }};
-        return hcd_send_batch(dev_to_hcd(ddf_fun_get_dev(fun)), target,
-            USB_DIRECTION_IN, data, size, setup_data, callback, NULL, arg,
-            "READ");
+
+        target.address = dev->address;
+
+        return hcd_send_batch(hcd, dev, target, USB_DIRECTION_IN,
+            data, size, setup_data,
+            callback, arg, "READ");
 }
 
@@ -242 +242 @@
  * @return Error code.
  */
-static int dev_write(ddf_fun_t *fun, usb_endpoint_t endpoint,
-    uint64_t setup_data, const uint8_t *data, size_t size,
-    usbhc_iface_transfer_out_callback_t callback, void *arg)
+static int dev_write(ddf_fun_t *fun, usb_target_t target,
+    uint64_t setup_data, const char *data, size_t size,
+    usb_iface_transfer_callback_t callback, void *arg)
 {
         assert(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         device_t *dev = ddf_fun_data_get(fun);
         assert(dev);
-        const usb_target_t target = {{
-            .address  = dev->address,
-            .endpoint = endpoint,
-        }};
-        return hcd_send_batch(dev_to_hcd(ddf_fun_get_dev(fun)),
-            target, USB_DIRECTION_OUT, (uint8_t*)data, size, setup_data, NULL,
+
+        target.address = dev->address;
+
+        return hcd_send_batch(hcd, dev, target, USB_DIRECTION_OUT,
+            (char *) data, size, setup_data,
             callback, arg, "WRITE");
 }
@@ -411 +411 @@
         init_match_ids(&mids);
 
-        usb_target_t control_ep = {{
+        const usb_target_t control_ep = {{
                 .address = device->address,
-                .endpoint = 0
+                .endpoint = 0,
         }};
 
@@ -422 +422 @@
         usb_log_debug("Device(%d): Requesting full device descriptor.",
             device->address);
-        ssize_t got = hcd_send_batch_sync(hcd, control_ep, USB_DIRECTION_IN,
-            &desc, sizeof(desc), *(uint64_t *)&get_device_desc,
+        ssize_t got = hcd_send_batch_sync(hcd, device, control_ep, USB_DIRECTION_IN,
+            (char *) &desc, sizeof(desc), *(uint64_t *)&get_device_desc,
             "read device descriptor");
         if (got < 0) {