Changeset 3b5d1535 in mainline for uspace/drv/uhci-rhd/port.h

Timestamp:

2011-02-23T10:28:21Z (14 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/uhci-rhd/port.h (modified) (3 diffs)

uspace/drv/uhci-rhd/port.h

@@ -36 +36 @@
 
 #include <assert.h>
-#include <driver.h> /* device_t */
+#include <ddf/driver.h>
 #include <stdint.h>
 #include <usb/usbdevice.h>
@@ -48 +48 @@
         unsigned wait_period_usec;
         usb_hc_connection_t hc_connection;
-        device_t *rh;
+        ddf_dev_t *rh;
         devman_handle_t attached_device;
         fid_t checker;
@@ -55 +55 @@
 int uhci_port_init(
   uhci_port_t *port, port_status_t *address, unsigned number,
-  unsigned usec, device_t *rh, int parent_phone);
+  unsigned usec, ddf_dev_t *rh, int parent_phone);
 
 void uhci_port_fini(uhci_port_t *port);