Changeset 9848c77 in mainline


Ignore:
Timestamp:
2018-01-11T04:14:40Z (7 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
17783bf
Parents:
0892663a
git-author:
Ondřej Hlavatý <aearsis@…> (2018-01-11 04:10:46)
git-committer:
Ondřej Hlavatý <aearsis@…> (2018-01-11 04:14:40)
Message:

usbhost: renamed bus_device_remove to bus_device_gone

Location:
uspace
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r0892663a r9848c77  
    203203 * @return Error code.
    204204 */
    205 static void device_remove(device_t *dev)
     205static void device_gone(device_t *dev)
    206206{
    207207        int err;
    … …  
    369369
    370370        .device_enumerate = device_enumerate,
    371         .device_remove = device_remove,
     371        .device_gone = device_gone,
    372372        .device_online = device_online,
    373373        .device_offline = device_offline,

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

    r0892663a r9848c77  
    206206
    207207        /* Remove device from XHCI bus. */
    208         bus_device_remove(&dev->base);
     208        bus_device_gone(&dev->base);
    209209
    210210        return EOK;

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

    r0892663a r9848c77  
    103103        /* Operations on device */
    104104        int (*device_enumerate)(device_t *);
    105         void (*device_remove)(device_t *);
     105        void (*device_gone)(device_t *);
    106106        int (*device_online)(device_t *);                       /**< Optional */
    107107        void (*device_offline)(device_t *);                     /**< Optional */
    … …  
    149149
    150150int bus_device_enumerate(device_t *);
    151 void bus_device_remove(device_t *);
     151void bus_device_gone(device_t *);
    152152
    153153int bus_device_online(device_t *);

  • uspace/lib/usbhost/src/bus.c

    r0892663a r9848c77  
    167167                 */
    168168                fibril_mutex_unlock(&dev->guard);
    169                 bus_device_remove(child);
     169                bus_device_gone(child);
    170170                fibril_mutex_lock(&dev->guard);
    171171        }
    … …  
    176176 * Resolve a USB device that is gone.
    177177 */
    178 void bus_device_remove(device_t *dev)
     178void bus_device_gone(device_t *dev)
    179179{
    180180        assert(dev);
    181181        assert(dev->fun == NULL);
    182182
    183         const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_remove);
     183        const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_gone);
    184184        assert(ops);
    185185
    … …  
    212212
    213213        /* Tell the HC to release its resources. */
    214         ops->device_remove(dev);
     214        ops->device_gone(dev);
    215215
    216216        /* Release the EP0 bus reference */

  • uspace/lib/usbhost/src/ddf_helpers.c

    r0892663a r9848c77  
    354354        assert(victim->hub == hub);
    355355
    356         bus_device_remove(victim);
     356        bus_device_gone(victim);
    357357        return EOK;
    358358}
Note: See TracChangeset for help on using the changeset viewer.