Changeset ea6a824 in mainline for uspace/drv/vhc/hub

Timestamp:

2011-01-28T10:49:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

81c0854f, 89beb08

Parents:

6265a2b (diff), c5c003c (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 standalone virtual hub

Location:

uspace/drv/vhc/hub

Files:

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

uspace/drv/vhc/hub/hub.h

@@ -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)
 

uspace/drv/vhc/hub/virthub.c

@@ -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;
 }
 

uspace/drv/vhc/hub/virthub.h

@@ -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. */