Changeset 19a1800 in mainline for uspace/drv/vhc/hub/hub.c

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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:

Merge with the current development

File:

• uspace/drv/vhc/hub/hub.c (modified) (4 diffs)

uspace/drv/vhc/hub/hub.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -38 +38 @@
 #include <errno.h>
 #include <str_error.h>
+#include <assert.h>
 #include <stdlib.h>
-#include <driver.h>
-#include <usb/usbdrv.h>
+#include <ddf/driver.h>
 
 #include "hub.h"
@@ -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.
  *
@@ -173 +195 @@
         }
 
-        return 0;
+        return -1;
 }