Changeset 82122f3 in mainline for uspace/drv/vhc/devices.c

Timestamp:

2010-12-17T14:51:41Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1f383dde

Parents:

692f13e4 (diff), 11658b64 (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:

Merged development into lelian/hidd

File:

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

uspace/drv/vhc/devices.c

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