Changeset 327f147 in mainline for uspace/lib/usbhost/src/usb2_bus.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/usb2_bus.c (modified) (5 diffs)

uspace/lib/usbhost/src/usb2_bus.c

@@ -126 +126 @@
         usb_log_debug("Device(%d): Requesting first 8B of device descriptor.",
             address);
-        ssize_t got = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_IN,
-            &desc, CTRL_PIPE_MIN_PACKET_SIZE, *(uint64_t *)&get_device_desc_8,
+        ssize_t got = hcd_send_batch_sync(hcd, dev, default_target, USB_DIRECTION_IN,
+            (char *) &desc, CTRL_PIPE_MIN_PACKET_SIZE, *(uint64_t *)&get_device_desc_8,
             "read first 8 bytes of dev descriptor");
 
@@ -141 +141 @@
 
         usb_log_debug("Device(%d): Setting USB address.", address);
-        err = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_OUT,
+        err = hcd_send_batch_sync(hcd, dev, default_target, USB_DIRECTION_OUT,
             NULL, 0, *(uint64_t *)&set_address, "set address");
         if (err != 0) {
@@ -163 +163 @@
         }
 
-        bus_remove_ep(bus, default_target, USB_DIRECTION_BOTH);
+        bus_remove_ep(bus, dev, default_target, USB_DIRECTION_BOTH);
         return EOK;
 
 err_default_target:
-        bus_remove_ep(bus, default_target, USB_DIRECTION_BOTH);
+        bus_remove_ep(bus, dev, default_target, USB_DIRECTION_BOTH);
 err_address:
         bus_release_address(bus, address);
@@ -247 +247 @@
  * @note Assumes that the internal mutex is locked.
  */
-static endpoint_t *usb2_bus_find_ep(bus_t *bus_base, usb_target_t target, usb_direction_t direction)
+static endpoint_t *usb2_bus_find_ep(bus_t *bus_base, device_t *device, usb_target_t target, usb_direction_t direction)
 {
         usb2_bus_t *bus = bus_to_usb2_bus(bus_base);
@@ -293 +293 @@
 
         /* Check for existence */
-        if (usb2_bus_find_ep(bus_base, ep->target, ep->direction))
+        if (usb2_bus_find_ep(bus_base, ep->device, ep->target, ep->direction))
                 return EEXIST;