Changeset 3f03199 in mainline for uspace/drv/infrastructure/rootmac/rootmac.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/drv/infrastructure/rootmac/rootmac.c (modified) (2 diffs)

uspace/drv/infrastructure/rootmac/rootmac.c

@@ -54 +54 @@
                         .address = 0xfec00000,
                         .size = 4,
+                        .relative = false,
                         .endianness = LITTLE_ENDIAN
                 }
@@ -62 +63 @@
                         .address = 0xfee00000,
                         .size = 4,
+                        .relative = false,
                         .endianness = LITTLE_ENDIAN
                 }