Changes in uspace/drv/vhc/devices.c [774afaae:9223dc5c] in mainline

File:

• uspace/drv/vhc/devices.c (modified) (8 diffs)

uspace/drv/vhc/devices.c

@@ -47 +47 @@
 #include "devices.h"
 #include "hub.h"
-#include "hub/virthub.h"
 #include "vhcd.h"
 
@@ -70 +69 @@
         list_append(&dev->link, &devices);
         
-        virthub_connect_device(&virtual_hub_device, dev);
+        hub_add_device(dev);
         
         return dev;
@@ -79 +78 @@
 void virtdev_destroy_device(virtdev_connection_t *dev)
 {
-        virthub_disconnect_device(&virtual_hub_device, dev);
+        hub_remove_device(dev);
         list_remove(&dev->link);
         free(dev);
@@ -95 +94 @@
                     = list_get_instance(pos, virtdev_connection_t, link);
                 
-                if (!virthub_is_device_enabled(&virtual_hub_device, dev)) {
+                if (!hub_can_device_signal(dev)) {
                         continue;
                 }
@@ -146 +145 @@
          * (if the address matches).
          */
-        if (virtual_hub_device.address == transaction->target.address) {
+        if (virthub_dev.address == transaction->target.address) {
                 size_t tmp;
                 dprintf(1, "sending `%s' transaction to hub",
@@ -152 +151 @@
                 switch (transaction->type) {
                         case USBVIRT_TRANSACTION_SETUP:
-                                virtual_hub_device.transaction_setup(
-                                    &virtual_hub_device,
+                                virthub_dev.transaction_setup(&virthub_dev,
                                     transaction->target.endpoint,
                                     transaction->buffer, transaction->len);
@@ -159 +157 @@
                                 
                         case USBVIRT_TRANSACTION_IN:
-                                virtual_hub_device.transaction_in(
-                                    &virtual_hub_device,
+                                virthub_dev.transaction_in(&virthub_dev,
                                     transaction->target.endpoint,
                                     transaction->buffer, transaction->len,
@@ -170 +167 @@
                                 
                         case USBVIRT_TRANSACTION_OUT:
-                                virtual_hub_device.transaction_out(
-                                    &virtual_hub_device,
+                                virthub_dev.transaction_out(&virthub_dev,
                                     transaction->target.endpoint,
                                     transaction->buffer, transaction->len);