Changeset 3b5d1535 in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2011-02-23T10:28:21Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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/usbhub/usbhub.h (modified) (3 diffs)

uspace/drv/usbhub/usbhub.h

@@ -38 +38 @@
 #include <ipc/devman.h>
 #include <usb/usb.h>
-#include <driver.h>
+#include <ddf/driver.h>
 
 #define NAME "usbhub"
@@ -63 +63 @@
         //usb_hcd_attached_device_info_t * usb_device;
         /** General device info*/
-        device_t * device;
+        ddf_dev_t * device;
         /** connection to hcd */
         //usb_device_connection_t connection;
@@ -84 +84 @@
  * @return Error code.
  */
-int usb_add_hub_device(device_t *dev);
+int usb_add_hub_device(ddf_dev_t *dev);
 
 /**