Changeset 9c5fd7a in mainline

Timestamp:

2011-10-15T14:30:18Z (13 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:

• drv/bus/usb/usbmouse/mouse.c (modified) (1 diff)
• lib/usbdev/include/usb/dev/driver.h (modified) (1 diff)
• lib/usbdev/src/devdrv.c (modified) (3 diffs)

uspace/drv/bus/usb/usbmouse/mouse.c

@@ -124 +124 @@
         mouse->console_sess = NULL;
         
-        usb_device_destroy(dev);
+        usb_device_deinit(dev);
 }
 

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -172 +172 @@
 int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
 int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **);
-void usb_device_destroy(usb_device_t *);
+void usb_device_deinit(usb_device_t *);
 void * usb_device_data_alloc(usb_device_t *, size_t);
 

uspace/lib/usbdev/src/devdrv.c

@@ -154 +154 @@
         rc = driver->ops->device_add(dev);
         if (rc != EOK)
-                usb_device_destroy(dev);
+                usb_device_deinit(dev);
         return rc;
 }
@@ -191 +191 @@
         const int ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
-                usb_device_destroy(usb_dev);
+                usb_device_deinit(usb_dev);
 
         return ret;
@@ -590 +590 @@
 /** Destroy instance of a USB device.
  *
- * @param dev Device to be destroyed.
- */
-void usb_device_destroy(usb_device_t *dev)
+ * @param dev Device to be de-initialized.
+ *
+ * Does not free/destroy supplied pointer.
+ */
+void usb_device_deinit(usb_device_t *dev)
 {
         if (dev == NULL) {