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

Timestamp:

2011-05-27T07:10:12Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

ffca03c

Parents:

8bb61e6 (diff), 1889786 (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 usb/development

File:

• uspace/drv/uhci-rhd/port.h (modified) (2 diffs)

uspace/drv/uhci-rhd/port.h

@@ -38 +38 @@
 #include <fibril.h>
 #include <ddf/driver.h>
-#include <usb/dev/hc.h> /* usb_hc_connection_t */
+#include <usb/hc.h> /* usb_hc_connection_t */
 
 typedef uint16_t port_status_t;
@@ -57 +57 @@
 typedef struct uhci_port
 {
-        char *id_string;
+        const char *id_string;
         port_status_t *address;
         unsigned number;