Changeset cd4ae1e in mainline for uspace/drv/vhc/hub/virthub.c

Timestamp:

2011-04-28T13:14:14Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

54d71e1, a146aa33

Parents:

74f00b6 (diff), c82135a8 (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:

Better virtual USB HID; USB-virt rewritten

The new virtual USB HID is easily extensible with new interfaces that
might provide different report descriptors.

The virtual host controller was completely rewritten together
with the libusbvirt.

The documentation is missing and the code would deserver some refactoring.
That will appear later.

File:

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

uspace/drv/vhc/hub/virthub.c

@@ -34 +34 @@
  */
 #include <usb/classes/classes.h>
-#include <usbvirt/hub.h>
 #include <usbvirt/device.h>
 #include <assert.h>
@@ -153 +152 @@
         dev->ops = &hub_ops;
         dev->descriptors = &descriptors;
-        dev->lib_debug_level = 0;
-        dev->lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL;
 
         hub_t *hub = malloc(sizeof(hub_t));
@@ -164 +161 @@
         dev->device_data = hub;
 
-        int rc;
-#ifdef STANDALONE_HUB
-        dev->name = "hub";
-        rc = usbvirt_connect(dev);
-#else
-        rc = usbvirt_connect_local(dev);
-#endif
-
-        return rc;
+        return EOK;
 }
 
@@ -181 +170 @@
  * @return Port device was connected to.
  */
-int virthub_connect_device(usbvirt_device_t *dev, virtdev_connection_t *conn)
+int virthub_connect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
 {
         assert(dev != NULL);
@@ -201 +190 @@
  * @return Error code.
  */
-int virthub_disconnect_device(usbvirt_device_t *dev, virtdev_connection_t *conn)
+int virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
 {
         assert(dev != NULL);
@@ -212 +201 @@
         hub_release(hub);
 
-        return ENOTSUP;
+        return EOK;
 }
 
@@ -221 +210 @@
  * @return Whether port is signalling to the device.
  */
-bool virthub_is_device_enabled(usbvirt_device_t *dev, virtdev_connection_t *conn)
+bool virthub_is_device_enabled(usbvirt_device_t *dev, vhc_virtdev_t *conn)
 {
         assert(dev != NULL);