Changeset 68a68705 in mainline

Timestamp:

2011-01-25T18:06:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bd8c753d, e0ba26b

Parents:

875e7227

Message:

Virtual hub knows how to disconnect a device

When a virtual device is disconnected from virtual host controller, the root
hub makes transition to DISABLED state on port where the change occured.

Location:

uspace/drv/vhc/hub

Files:

• hub.c (modified) (1 diff)
• hub.h (modified) (1 diff)
• virthub.c (modified) (1 diff)

uspace/drv/vhc/hub/hub.c

@@ -155 +155 @@
 }
 
+/** Disconnects a device from a hub.
+ *
+ * @param hub Hub the device was connected to.
+ * @param device Device to be disconnected.
+ * @return Error code.
+ */
+int hub_disconnect_device(hub_t *hub, void *device)
+{
+        size_t index = hub_find_device(hub, device);
+        if (index == (size_t) -1) {
+                return ENOENT;
+        }
+
+        hub_port_t *port = &hub->ports[index];
+
+        port->connected_device = NULL;
+        port->state = HUB_PORT_STATE_DISCONNECTED;
+        set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
+
+        return EOK;
+}
+
 /** Find port device is connected to.
  *

uspace/drv/vhc/hub/hub.h

@@ -94 +94 @@
 void hub_init(hub_t *);
 size_t hub_connect_device(hub_t *, void *);
+int hub_disconnect_device(hub_t *, void *);
 size_t hub_find_device(hub_t *, void *);
 void hub_acquire(hub_t *);

uspace/drv/vhc/hub/virthub.c

@@ -203 +203 @@
 
         hub_acquire(hub);
-        /* TODO: implement. */
+        hub_disconnect_device(hub, conn);
         hub_release(hub);