Changeset 10cd715 in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

2017-12-14T14:25:40Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

bd05140

Parents:

6455d39

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-14 14:24:28)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-14 14:25:40)

Message:

usbhost bus: request_address → reserve_default_address

It doesn't make sense to expose requesting addresses other than the
default one from the bus.

File:

• uspace/lib/usbhost/src/bus.c (modified) (1 diff)

uspace/lib/usbhost/src/bus.c

@@ -199 +199 @@
 }
 
-int bus_request_address(bus_t *bus, usb_address_t *hint, bool strict, usb_speed_t speed)
-{
-        assert(bus);
-
-        if (!bus->ops.request_address)
-                return ENOTSUP;
-
-        fibril_mutex_lock(&bus->guard);
-        const int r = bus->ops.request_address(bus, hint, strict, speed);
+int bus_reserve_default_address(bus_t *bus, usb_speed_t speed)
+{
+        assert(bus);
+
+        if (!bus->ops.reserve_default_address)
+                return ENOTSUP;
+
+        fibril_mutex_lock(&bus->guard);
+        const int r = bus->ops.reserve_default_address(bus, speed);
         fibril_mutex_unlock(&bus->guard);
         return r;
 }
 
-int bus_release_address(bus_t *bus, usb_address_t address)
-{
-        assert(bus);
-
-        if (!bus->ops.release_address)
-                return ENOTSUP;
-
-        fibril_mutex_lock(&bus->guard);
-        const int r = bus->ops.release_address(bus, address);
+int bus_release_default_address(bus_t *bus)
+{
+        assert(bus);
+
+        /* If this op is not set, allow everything */
+        if (!bus->ops.release_default_address)
+                return ENOTSUP;
+
+        fibril_mutex_lock(&bus->guard);
+        const int r = bus->ops.release_default_address(bus);
         fibril_mutex_unlock(&bus->guard);
         return r;