Changeset 95622c4 in mainline

Timestamp:

2011-01-28T10:19:29Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

679a135

Parents:

9f0318c

Message:

Add standalone virtual hub

Similar to virtual USB keyboard (vuk'), vuh' is a virtual USB hub.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/virtusbhub/Makefile (added)
• uspace/app/virtusbhub/main.c (added)
• uspace/doc/doxygroups.h (modified) (1 diff)
• uspace/drv/vhc/hub/hub.h (modified) (1 diff)
• uspace/drv/vhc/hub/virthub.c (modified) (1 diff)
• uspace/drv/vhc/hub/virthub.h (modified) (1 diff)

boot/Makefile.common

@@ -144 +144 @@
         $(USPACE_PATH)/app/usbinfo/usbinfo \
         $(USPACE_PATH)/app/virtusbkbd/vuk \
+        $(USPACE_PATH)/app/virtusbhub/vuh \
         $(USPACE_PATH)/app/websrv/websrv
 

uspace/Makefile

@@ -53 +53 @@
         app/usbinfo \
         app/virtusbkbd \
+        app/virtusbhub \
         app/netecho \
         app/nettest1 \

uspace/doc/doxygroups.h

@@ -195 +195 @@
                  */
 
+                /**
+                 * @defgroup usbvirthub Virtual USB hub
+                 * @ingroup usbvirt
+                 * @brief Extra virtual USB hub for virtual host controller.
+                 * @details
+                 * Some of the sources are shared with virtual host controller,
+                 * see @ref drvusbvhc for the rest of the files.
+                 */
+
          /**
           * @defgroup drvusbhub USB hub driver

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