Changeset 10cd715 in mainline for uspace/lib/usbhost/include/usb/host/bus.h

Timestamp:

2017-12-14T14:25:40Z (8 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/include/usb/host/bus.h (modified) (2 diffs)

uspace/lib/usbhost/include/usb/host/bus.h

@@ -96 +96 @@
         void (*endpoint_set_toggle)(endpoint_t *, bool);        /**< Optional */
 
-        int (*request_address)(bus_t *, usb_address_t*, bool, usb_speed_t);
-        int (*release_address)(bus_t *, usb_address_t);
+        int (*reserve_default_address)(bus_t *, usb_speed_t);
+        int (*release_default_address)(bus_t *);
 
         int (*reset_toggle)(bus_t *, usb_target_t, toggle_reset_mode_t);
@@ -137 +137 @@
 size_t bus_count_bw(endpoint_t *, size_t);
 
-int bus_request_address(bus_t *, usb_address_t *, bool, usb_speed_t);
-int bus_release_address(bus_t *, usb_address_t);
-
-
-static inline int bus_reserve_default_address(bus_t *bus, usb_speed_t speed) {
-        usb_address_t addr = USB_ADDRESS_DEFAULT;
-
-        const int r = bus_request_address(bus, &addr, true, speed);
-        assert(addr == USB_ADDRESS_DEFAULT);
-        return r;
-}
-
-static inline int bus_release_default_address(bus_t *bus) {
-        return bus_release_address(bus, USB_ADDRESS_DEFAULT);
-}
+int bus_reserve_default_address(bus_t *, usb_speed_t);
+int bus_release_default_address(bus_t *);
 
 int bus_reset_toggle(bus_t *, usb_target_t, bool);