Changeset 81c0854f in mainline for uspace/drv/vhc/hub

Timestamp:

2011-01-28T12:41:33Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ba5ab09

Parents:

c2020f7 (diff), ea6a824 (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 from usb/development

Location:

uspace/drv/vhc/hub

Files:

• hub.c (modified) (3 diffs)
• hub.h (modified) (3 diffs)
• virthub.c (modified) (3 diffs)
• virthub.h (modified) (2 diffs)
• virthubops.c (modified) (1 diff)

uspace/drv/vhc/hub/hub.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -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;
 }
 

uspace/drv/vhc/hub/hub.h

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -38 +38 @@
 #include <fibril_synch.h>
 
+#ifndef HUB_PORT_COUNT
 #define HUB_PORT_COUNT 2
+#endif
 #define BITS2BYTES(bits) (bits ? ((((bits)-1)>>3)+1) : 0)
 
@@ -94 +96 @@
 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

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -164 +164 @@
         dev->device_data = hub;
 
-        usbvirt_connect_local(dev);
-
-        return EOK;
+        int rc;
+#ifdef STANDALONE_HUB
+        dev->name = "hub";
+        rc = usbvirt_connect(dev);
+#else
+        rc = usbvirt_connect_local(dev);
+#endif
+
+        return rc;
 }
 
@@ -203 +209 @@
 
         hub_acquire(hub);
-        /* TODO: implement. */
+        hub_disconnect_device(hub, conn);
         hub_release(hub);
 

uspace/drv/vhc/hub/virthub.h

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */
@@ -37 +37 @@
 
 #include <usbvirt/device.h>
+#include "hub.h"
+
+#ifdef STANDALONE_HUB
+#define virtdev_connection_t int
+#else
 #include "../devices.h"
-#include "hub.h"
+#endif
 
 /** Endpoint number for status change pipe. */

uspace/drv/vhc/hub/virthubops.c

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbvhc
  * @{
  */