Changeset 9c5fd7a in mainline


Ignore:
Timestamp:
2011-10-15T14:30:18Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b803845
Parents:
ce2a1c2
Message:

libusbdev: Rename _destroy ⇒ _deinit

The function does not free provided pointer.

Location:
uspace
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbmouse/mouse.c

    rce2a1c2 r9c5fd7a  
    124124        mouse->console_sess = NULL;
    125125       
    126         usb_device_destroy(dev);
     126        usb_device_deinit(dev);
    127127}
    128128
  • uspace/lib/usbdev/include/usb/dev/driver.h

    rce2a1c2 r9c5fd7a  
    172172int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
    173173int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **);
    174 void usb_device_destroy(usb_device_t *);
     174void usb_device_deinit(usb_device_t *);
    175175void * usb_device_data_alloc(usb_device_t *, size_t);
    176176
  • uspace/lib/usbdev/src/devdrv.c

    rce2a1c2 r9c5fd7a  
    154154        rc = driver->ops->device_add(dev);
    155155        if (rc != EOK)
    156                 usb_device_destroy(dev);
     156                usb_device_deinit(dev);
    157157        return rc;
    158158}
     
    191191        const int ret = driver->ops->device_gone(usb_dev);
    192192        if (ret == EOK)
    193                 usb_device_destroy(usb_dev);
     193                usb_device_deinit(usb_dev);
    194194
    195195        return ret;
     
    590590/** Destroy instance of a USB device.
    591591 *
    592  * @param dev Device to be destroyed.
    593  */
    594 void usb_device_destroy(usb_device_t *dev)
     592 * @param dev Device to be de-initialized.
     593 *
     594 * Does not free/destroy supplied pointer.
     595 */
     596void usb_device_deinit(usb_device_t *dev)
    595597{
    596598        if (dev == NULL) {
Note: See TracChangeset for help on using the changeset viewer.