Changeset b4b534ac in mainline for uspace/drv/bus/usb/vhc/conndev.c

Timestamp:

2016-07-22T08:24:47Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/vhc/conndev.c (modified) (3 diffs)

uspace/drv/bus/usb/vhc/conndev.c

@@ -38 +38 @@
 #include <ddf/driver.h>
 #include <usbvirt/ipc.h>
+#include <usb/debug.h>
 #include <async.h>
-#include "conn.h"
+
+#include "vhcd.h"
 
 static fibril_local uintptr_t plugged_device_handle = 0;
@@ -94 +96 @@
     ipc_call_t *icall)
 {
-        vhc_data_t *vhc = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        vhc_data_t *vhc = ddf_fun_data_get(fun);
         
         async_sess_t *callback =
@@ -125 +127 @@
 void on_client_close(ddf_fun_t *fun)
 {
-        vhc_data_t *vhc = ddf_dev_data_get(ddf_fun_get_dev(fun));
+        vhc_data_t *vhc = ddf_fun_data_get(fun);
 
         if (plugged_device_handle != 0) {