Changeset f1d6866 in mainline for uspace/drv/bus/usb/vhc/vhcd.h

Timestamp:

2011-09-18T21:22:59Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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 mainline changes

File:

• uspace/drv/bus/usb/vhc/vhcd.h (modified) (2 diffs)

uspace/drv/bus/usb/vhc/vhcd.h

@@ -39 +39 @@
 #include <usbvirt/device.h>
 #include <usb/host/usb_endpoint_manager.h>
-#include <usb/host/device_keeper.h>
+#include <usb/host/usb_device_manager.h>
 #include <usbhc_iface.h>
 #include <async.h>
@@ -60 +60 @@
         fibril_mutex_t guard;
         usb_endpoint_manager_t ep_manager;
-        usb_device_keeper_t dev_keeper;
+        usb_device_manager_t dev_manager;
         usbvirt_device_t *hub;
         ddf_fun_t *hc_fun;