Changeset 3f03199 in mainline for uspace/lib/c/generic/time.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/lib/c/generic/time.c (modified) (1 diff)

uspace/lib/c/generic/time.c

@@ -556 +556 @@
                 
                 void *addr;
-                rc = physmem_map((void *) faddr, 1,
-                    AS_AREA_READ | AS_AREA_CACHEABLE, &addr);
+                rc = physmem_map(faddr, 1, AS_AREA_READ | AS_AREA_CACHEABLE,
+                    &addr);
                 if (rc != EOK) {
                         as_area_destroy(addr);