Changeset 5dfb70c9 in mainline for uspace/lib/usbhost/src/usb2_bus.c

Timestamp:

2017-12-29T12:10:56Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

5c75456

Parents:

415c5116

Message:

uhci: moved offline call from usbhost, terminating hanging transfers

File:

• uspace/lib/usbhost/src/usb2_bus.c (modified) (2 diffs)

uspace/lib/usbhost/src/usb2_bus.c

@@ -352 +352 @@
 }
 
-static int usb2_bus_device_online(device_t *device)
-{
-        usb2_bus_t *bus = bus_to_usb2_bus(device->bus);
-        assert(bus);
-
-        // FIXME: Implement me!
-
-        return ENOTSUP;
-}
-
-static int usb2_bus_device_offline(device_t *device)
-{
-        usb2_bus_t *bus = bus_to_usb2_bus(device->bus);
-        assert(bus);
-
-        int err;
-        /* Tear down all drivers working with the device. */
-        if ((err = ddf_fun_offline(device->fun))) {
-                return err;
-        }
-
-        /* Block creation of new endpoints and transfers. */
-        usb_log_info("Device(%d): Going offline.", device->address);
-        fibril_mutex_lock(&device->guard);
-        device->online = false;
-        fibril_mutex_unlock(&device->guard);
-
-        /* FIXME: This implementation leaves sleeping parts of drivers around.
-         * With XHCI bus, the HID driver disengages and completely deactivates
-         * when the DDF function is offlined. In USB2 bus, the driver receives
-         * dev_remove and disengages "on paper" but later when interrupt message arrives,
-         * some sleeping code is woken up and crashes the driver.
-         *
-         * The XHCI does 2 extra things that might prevent this behavior:
-         *   (1) deconfigure the device,
-         *   (2) deallocate all transfer TRB rings
-         */
-
-        return EOK;
-}
-
 static endpoint_t *usb2_bus_create_ep(device_t *dev, const usb_endpoint_desc_t *desc)
 {
@@ -496 +455 @@
         .device_enumerate = usb2_bus_device_enumerate,
         .device_find_endpoint = usb2_bus_find_ep,
-        .device_online = usb2_bus_device_online,
-        .device_offline = usb2_bus_device_offline,
         .endpoint_create = usb2_bus_create_ep,
         .endpoint_register = usb2_bus_register_ep,