Changeset 5e2b1ae6 in mainline for uspace/drv

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/drv/bus/usb

Files:

• uhci/hc.c (modified) (1 diff)
• usbhub/port.c (modified) (1 diff)
• xhci/bus.c (modified) (3 diffs)
• xhci/bus.h (modified) (1 diff)

uspace/drv/bus/usb/uhci/hc.c

@@ -388 +388 @@
 int hc_init_mem_structures(hc_t *instance, hc_device_t *hcd)
 {
-        int err;
         assert(instance);
 
-        if ((err = usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11)))
-                return err;
+        usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11);
 
         bus_t *bus = (bus_t *) &instance->bus;

uspace/drv/bus/usb/usbhub/port.c

@@ -406 +406 @@
 
         /* Reserve default address */
-        while ((ret = usbhc_reserve_default_address(exch, speed)) == ENOENT) {
+        while ((ret = usbhc_reserve_default_address(exch, speed)) == EAGAIN) {
                 async_usleep(1000000);
         }

uspace/drv/bus/usb/xhci/bus.c

@@ -426 +426 @@
 }
 
-static int reserve_default_address(bus_t *bus_base, usb_speed_t speed)
-{
-        xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
-
-        if (xhci_bus->default_address_speed != USB_SPEED_MAX)
-                /* Already allocated */
-                return ENOENT;
-
-        xhci_bus->default_address_speed = speed;
-        return EOK;
-}
-
-static int release_default_address(bus_t *bus_base)
-{
-        xhci_bus_t *xhci_bus = bus_to_xhci_bus(bus_base);
-
-        xhci_bus->default_address_speed = USB_SPEED_MAX;
-        return EOK;
-}
-
 static usb_transfer_batch_t *batch_create(endpoint_t *ep)
 {
@@ -461 +441 @@
 // TODO: Is it good idea to use this macro? It blurrs the fact that the callbacks and static functions are called the same.
 #define BIND_OP(op) .op = op,
-        BIND_OP(reserve_default_address)
-        BIND_OP(release_default_address)
-
         BIND_OP(device_enumerate)
         BIND_OP(device_remove)
@@ -501 +478 @@
         bus->hc = hc;
         bus->base.ops = &xhci_bus_ops;
-        bus->default_address_speed = USB_SPEED_MAX;
         return EOK;
 }

uspace/drv/bus/usb/xhci/bus.h

@@ -51 +51 @@
 
         xhci_device_t **devices_by_slot;        /**< Devices by Slot ID */
-
-        usb_speed_t default_address_speed;      /**< Used to get speed from usb hubs */
 } xhci_bus_t;