Changes in uspace/lib/usbdev/src/devdrv.c [b803845:065064e6] in mainline

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (8 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -81 +81 @@
  * @return Number of pipes (excluding default control pipe).
  */
-static size_t count_other_pipes(const usb_endpoint_description_t **endpoints)
+static size_t count_other_pipes(usb_endpoint_description_t **endpoints)
 {
         size_t count = 0;
@@ -101 +101 @@
  * @return Error code.
  */
-static int initialize_other_pipes(const usb_endpoint_description_t **endpoints,
+static int initialize_other_pipes(usb_endpoint_description_t **endpoints,
     usb_device_t *dev, int alternate_setting)
 {
@@ -154 +154 @@
         rc = driver->ops->device_add(dev);
         if (rc != EOK)
-                usb_device_deinit(dev);
+                usb_device_destroy(dev);
         return rc;
 }
@@ -191 +191 @@
         const int ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
-                usb_device_deinit(usb_dev);
+                usb_device_destroy(usb_dev);
 
         return ret;
@@ -238 +238 @@
  */
 int usb_device_select_interface(usb_device_t *dev, uint8_t alternate_setting,
-    const usb_endpoint_description_t **endpoints)
+    usb_endpoint_description_t **endpoints)
 {
         if (dev->interface_no < 0) {
@@ -321 +321 @@
  */
 int usb_device_create_pipes(const ddf_dev_t *dev, usb_device_connection_t *wire,
-    const usb_endpoint_description_t **endpoints,
+    usb_endpoint_description_t **endpoints,
     const uint8_t *config_descr, size_t config_descr_size,
     int interface_no, int interface_setting,
@@ -526 +526 @@
  */
 int usb_device_create(ddf_dev_t *ddf_dev,
-    const usb_endpoint_description_t **endpoints,
+    usb_endpoint_description_t **endpoints,
     usb_device_t **dev_ptr, const char **errstr_ptr)
 {
@@ -590 +590 @@
 /** Destroy instance of a USB device.
  *
- * @param dev Device to be de-initialized.
- *
- * Does not free/destroy supplied pointer.
- */
-void usb_device_deinit(usb_device_t *dev)
+ * @param dev Device to be destroyed.
+ */
+void usb_device_destroy(usb_device_t *dev)
 {
         if (dev == NULL) {