Changeset 5e2b1ae6 in mainline for uspace/lib/usbhost

Timestamp:

2018-01-07T01:54:45Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3dc3f99

Parents:

63431db2

Message:

usbhost: reserve default speed in library

Location:

uspace/lib/usbhost

Files:

• include/usb/host/bus.h (modified) (3 diffs)
• include/usb/host/usb2_bus.h (modified) (2 diffs)
• src/bus.c (modified) (2 diffs)
• src/ddf_helpers.c (modified) (1 diff)
• src/usb2_bus.c (modified) (7 diffs)

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

@@ -100 +100 @@
         void (*interrupt)(bus_t *, uint32_t);
         int (*status)(bus_t *, uint32_t *);
-        int (*reserve_default_address)(bus_t *, usb_speed_t);
-        int (*release_default_address)(bus_t *);
 
         /* Operations on device */
@@ -139 +137 @@
         const bus_ops_t *ops;
 
+        /* Reserving default address - USB_SPEED_MAX when free. */
+        usb_speed_t default_address_speed;
+
         /* This structure is meant to be extended by overriding. */
 } bus_t;
@@ -166 +167 @@
 
 int bus_reserve_default_address(bus_t *, usb_speed_t);
-int bus_release_default_address(bus_t *);
+void bus_release_default_address(bus_t *);
 
 #endif

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

@@ -50 +50 @@
         bus_t base;                     /**< Inheritance - keep this first */
 
-        /** The speed which reserved default address. Invalid unless reserved. */
-        usb_speed_t default_address_speed;
-
         /** Map of occupied addresses */
         bool address_occupied [USB_ADDRESS_COUNT];
@@ -64 +61 @@
 extern const bus_ops_t usb2_bus_ops;
 
-extern int usb2_bus_init(usb2_bus_t *, size_t);
+extern void usb2_bus_init(usb2_bus_t *, size_t);
 
 #endif

uspace/lib/usbhost/src/bus.c

@@ -54 +54 @@
         fibril_mutex_initialize(&bus->guard);
         bus->device_size = device_size;
+        bus->default_address_speed = USB_SPEED_MAX;
 }
 
@@ -239 +240 @@
         assert(bus);
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, reserve_default_address);
-        if (!ops)
-                return ENOTSUP;
-
         fibril_mutex_lock(&bus->guard);
-        const int r = ops->reserve_default_address(bus, speed);
-        fibril_mutex_unlock(&bus->guard);
-        return r;
-}
-
-int bus_release_default_address(bus_t *bus)
+        if (bus->default_address_speed != USB_SPEED_MAX) {
+                fibril_mutex_unlock(&bus->guard);
+                return EAGAIN;
+        } else {
+                bus->default_address_speed = speed;
+                fibril_mutex_unlock(&bus->guard);
+                return EOK;
+        }
+}
+
+void bus_release_default_address(bus_t *bus)
 {
         assert(bus);
-
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, release_default_address);
-        if (!ops)
-                return ENOTSUP;
-
-        fibril_mutex_lock(&bus->guard);
-        const int r = ops->release_default_address(bus);
-        fibril_mutex_unlock(&bus->guard);
-        return r;
+        bus->default_address_speed = USB_SPEED_MAX;
 }
 

uspace/lib/usbhost/src/ddf_helpers.c

@@ -137 +137 @@
 
         usb_log_debug("Device %d released default address\n", dev->address);
-        return bus_release_default_address(hcd->bus);
+        bus_release_default_address(hcd->bus);
+
+        return EOK;
 }
 

uspace/lib/usbhost/src/usb2_bus.c

@@ -100 +100 @@
  * @param bus usb_device_manager
  * @param addr Pointer to requested address value, place to store new address
- * @parma strict Fail if the requested address is not available.
  * @return Error code.
  * @note Default address is only available in strict mode.
  */
-static int request_address(usb2_bus_t *bus, usb_address_t *addr, bool strict)
+static int request_address(usb2_bus_t *bus, usb_address_t *addr)
 {
         int err;
@@ -114 +113 @@
                 return EINVAL;
 
-        /* Only grant default address to strict requests */
-        if ((*addr == USB_ADDRESS_DEFAULT) && !strict) {
-                if ((err = get_free_address(bus, addr)))
-                        return err;
-        }
-        else if (bus->address_occupied[*addr]) {
-                if (strict) {
-                        return ENOENT;
-                }
-                if ((err = get_free_address(bus, addr)))
-                        return err;
-        }
+        if ((err = get_free_address(bus, addr)))
+                return err;
 
         assert(usb_address_is_valid(*addr));
         assert(bus->address_occupied[*addr] == false);
-        assert(*addr != USB_ADDRESS_DEFAULT || strict);
+        assert(*addr != USB_ADDRESS_DEFAULT);
 
         bus->address_occupied[*addr] = true;
@@ -152 +141 @@
         /** Reserve address early, we want pretty log messages */
         usb_address_t address = USB_ADDRESS_DEFAULT;
-        if ((err = request_address(bus, &address, false))) {
+        if ((err = request_address(bus, &address))) {
                 usb_log_error("Failed to reserve new address: %s.",
                     str_error(err));
@@ -231 +220 @@
          * default address.
          */
-        dev->speed = bus->default_address_speed;
+        dev->speed = bus->base.default_address_speed;
         usb_log_debug("Found new %s speed USB device.", usb_str_speed(dev->speed));
 
@@ -301 +290 @@
 }
 
-static int usb2_bus_register_default_address(bus_t *bus_base, usb_speed_t speed)
-{
-        usb2_bus_t *bus = bus_to_usb2_bus(bus_base);
-        usb_address_t addr = USB_ADDRESS_DEFAULT;
-        const int err = request_address(bus, &addr, true);
-        if (err)
-                return err;
-        bus->default_address_speed = speed;
-        return EOK;
-}
-
-static int usb2_bus_release_default_address(bus_t *bus_base)
-{
-        usb2_bus_t *bus = bus_to_usb2_bus(bus_base);
-        return release_address(bus, USB_ADDRESS_DEFAULT);
-}
-
 const bus_ops_t usb2_bus_ops = {
-        .reserve_default_address = usb2_bus_register_default_address,
-        .release_default_address = usb2_bus_release_default_address,
         .device_enumerate = usb2_bus_device_enumerate,
         .endpoint_create = usb2_bus_create_ep,
@@ -334 +304 @@
  * @return Error code.
  */
-int usb2_bus_init(usb2_bus_t *bus, size_t available_bandwidth)
+void usb2_bus_init(usb2_bus_t *bus, size_t available_bandwidth)
 {
         assert(bus);
@@ -342 +312 @@
 
         bus->free_bw = available_bandwidth;
-
-        return EOK;
 }
 /**