Changeset 25696fea in mainline for uspace/drv/bus/usb/uhcirh/port.h

Timestamp:

2011-10-15T20:05:00Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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 with mainline

File:

• uspace/drv/bus/usb/uhcirh/port.h (modified) (2 diffs)

uspace/drv/bus/usb/uhcirh/port.h

@@ -39 +39 @@
 #include <ddf/driver.h>
 #include <usb/hc.h> /* usb_hc_connection_t */
+#include <usb/dev/hub.h>
 
 typedef uint16_t port_status_t;
@@ -62 +63 @@
         usb_hc_connection_t hc_connection;
         ddf_dev_t *rh;
-        devman_handle_t attached_device;
+        usb_hub_attached_device_t attached_device;
         fid_t checker;
 } uhci_port_t;