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

Timestamp:

2017-10-23T19:03:37Z (6 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/bus.c (modified) (2 diffs)

uspace/lib/usbhost/src/bus.c

@@ -99 +99 @@
 }
 
-int bus_remove_ep(bus_t *bus, usb_target_t target, usb_direction_t dir)
-{
-        assert(bus);
-        endpoint_t *ep = bus_find_endpoint(bus, target, dir);
+int bus_remove_ep(bus_t *bus, device_t *dev, usb_target_t target, usb_direction_t dir)
+{
+        assert(bus);
+        endpoint_t *ep = bus_find_endpoint(bus, dev, target, dir);
         if (!ep)
                 return ENOENT;
@@ -200 +200 @@
 /** Searches for an endpoint. Returns a reference.
  */
-endpoint_t *bus_find_endpoint(bus_t *bus, usb_target_t target, usb_direction_t dir)
-{
-        assert(bus);
-
-        fibril_mutex_lock(&bus->guard);
-        endpoint_t *ep = bus->ops.find_endpoint(bus, target, dir);
+endpoint_t *bus_find_endpoint(bus_t *bus, device_t *device, usb_target_t endpoint, usb_direction_t dir)
+{
+        assert(bus);
+
+        fibril_mutex_lock(&bus->guard);
+        endpoint_t *ep = bus->ops.find_endpoint(bus, device, endpoint, dir);
         if (ep) {
                 /* Exporting reference */