Changes in uspace/drv/vhc/hub/virthub.c [6cb58e6:0f21c0c] in mainline

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>
 #include <errno.h>
 #include <str_error.h>
-#include <assert.h>
 #include <stdlib.h>
-#include <ddf/driver.h>
+#include <driver.h>
 
 #include "virthub.h"
@@ -152 +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));
@@ -161 +163 @@
         dev->device_data = hub;
 
-        return EOK;
+        int rc;
+#ifdef STANDALONE_HUB
+        dev->name = "hub";
+        rc = usbvirt_connect(dev);
+#else
+        rc = usbvirt_connect_local(dev);
+#endif
+
+        return rc;
 }
 
@@ -170 +180 @@
  * @return Port device was connected to.
  */
-int virthub_connect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
+int virthub_connect_device(usbvirt_device_t *dev, virtdev_connection_t *conn)
 {
         assert(dev != NULL);
@@ -190 +200 @@
  * @return Error code.
  */
-int virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
+int virthub_disconnect_device(usbvirt_device_t *dev, virtdev_connection_t *conn)
 {
         assert(dev != NULL);
@@ -201 +211 @@
         hub_release(hub);
 
-        return EOK;
+        return ENOTSUP;
 }
 
@@ -210 +220 @@
  * @return Whether port is signalling to the device.
  */
-bool virthub_is_device_enabled(usbvirt_device_t *dev, vhc_virtdev_t *conn)
+bool virthub_is_device_enabled(usbvirt_device_t *dev, virtdev_connection_t *conn)
 {
         assert(dev != NULL);