Changeset bd7acda in mainline for uspace/lib

Timestamp:

2011-05-28T23:01:20Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

95067954, 98e15b1

Parents:

a066122c (diff), a2a3763 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fix various leakages

Add function for destroying whole usb device.

Hackingly fixed phone leakage in console.

Location:

uspace/lib

Files:

• drv/include/usbhc_iface.h (modified) (1 diff)
• usbdev/include/usb/dev/driver.h (modified) (1 diff)
• usbdev/src/devdrv.c (modified) (1 diff)

uspace/lib/drv/include/usbhc_iface.h

@@ -212 +212 @@
 /** USB host controller communication interface. */
 typedef struct {
-        int (*reserve_default_address)(ddf_fun_t *, usb_speed_t);
-        int (*release_default_address)(ddf_fun_t *);
         int (*request_address)(ddf_fun_t *, usb_speed_t, usb_address_t *);
         int (*bind_address)(ddf_fun_t *, usb_address_t, devman_handle_t);

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

@@ -168 +168 @@
 int usb_device_destroy_pipes(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 *);
 
 size_t usb_interface_count_alternates(uint8_t *, size_t, uint8_t);

uspace/lib/usbdev/src/devdrv.c

@@ -533 +533 @@
 }
 
+/** Destroy instance of a USB device.
+ *
+ * @param dev Device to be destroyed.
+ */
+void usb_device_destroy(usb_device_t *dev)
+{
+        if (dev == NULL) {
+                return;
+        }
+
+        /* Ignore errors and hope for the best. */
+        usb_device_destroy_pipes(dev->ddf_dev, dev->pipes, dev->pipes_count);
+        if (dev->descriptors.configuration != NULL) {
+                free(dev->descriptors.configuration);
+        }
+
+        if (dev->alternate_interfaces != NULL) {
+                if (dev->alternate_interfaces->alternatives != NULL) {
+                        free(dev->alternate_interfaces->alternatives);
+                }
+                free(dev->alternate_interfaces);
+        }
+
+        free(dev);
+}
+
 /**
  * @}