Changeset aa1922c in mainline

Timestamp:

2011-10-12T17:22:43Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4501e207

Parents:

8e5ce07

Message:

uhcirh: Implement removal of attached devices.

Location:

uspace/drv/bus/usb/uhcirh

Files:

• port.c (modified) (6 diffs)
• port.h (modified) (2 diffs)

uspace/drv/bus/usb/uhcirh/port.c

@@ -37 +37 @@
 #include <str_error.h>
 #include <async.h>
+#include <devman.h>
 
 #include <usb/usb.h>    /* usb_address_t */
-#include <usb/dev/hub.h>    /* usb_hc_new_device_wrapper */
 #include <usb/debug.h>
 
@@ -100 +100 @@
         port->number = number;
         port->wait_period_usec = usec;
-        port->attached_device = 0;
+        port->attached_device.handle = 0;
+        port->attached_device.address = -1;
         port->rh = rh;
 
@@ -168 +169 @@
 
                 /* Remove any old device */
-                if (instance->attached_device) {
+                if (instance->attached_device.handle) {
                         usb_log_debug2("%s: Removing device.\n",
                             instance->id_string);
@@ -257 +258 @@
 
         int ret, count = 0;
-        usb_address_t dev_addr;
         do {
                 ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
                     speed, uhci_port_reset_enable, port->number, port,
-                    &dev_addr, &port->attached_device, NULL, NULL, NULL);
+                    &port->attached_device.address,
+                    &port->attached_device.handle, NULL, NULL, NULL);
         } while (ret != EOK && ++count < 4);
 
@@ -272 +273 @@
 
         usb_log_info("New device at port %u, address %d (handle %" PRIun ").\n",
-            port->number, dev_addr, port->attached_device);
+            port->number, port->attached_device.address,
+            port->attached_device.handle);
         return EOK;
 }
@@ -278 +280 @@
 /** Remove device.
  *
- * @param[in] port Memory structure to use.
- * @return Error code.
- *
- * Does not work, DDF does not support device removal.
- * Does not even free used USB address (it would be dangerous if tis driver
- * is still running).
+ * @param[in] port Port instance to use.
+ * @return Error code.
  */
 int uhci_port_remove_device(uhci_port_t *port)
 {
-        usb_log_error("%s: Don't know how to remove device %" PRIun ".\n",
-            port->id_string, port->attached_device);
-        port->attached_device = 0;
-        return ENOTSUP;
+        usb_log_debug("Removing device on port %zu.\n", port->number);
+
+        /* Stop driver first */
+        int ret = devman_remove_function(port->attached_device.handle);
+        if (ret != EOK) {
+                usb_log_error("Failed to remove child function on port"
+                   " %zu: %s.\n", port->number, str_error(ret));
+                return ret;
+        }
+        port->attached_device.handle = 0;
+
+        /* Driver stopped, free used address */
+        ret = usb_hc_unregister_device(&port->hc_connection,
+            port->attached_device.address);
+        if (ret != EOK) {
+                usb_log_error("Failed to unregister address of removed device: "
+                    "%s.\n", str_error(ret));
+                return ret;
+        }
+
+        port->attached_device.address = -1;
+        usb_log_info("Removed device on port %zu.\n", port->number);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/bus/usb/uhcirh/port.h

@@ -39 +39 @@
 #include <ddf/driver.h>
 #include <usb/hc.h> /* usb_hc_connection_t */
+#include <usb/dev/hub.h>
 
 typedef uint16_t port_status_t;
@@ -62 +63 @@
         usb_hc_connection_t hc_connection;
         ddf_dev_t *rh;
-        devman_handle_t attached_device;
+        usb_hc_attached_device_t attached_device;
         fid_t checker;
 } uhci_port_t;