Changeset 6843a9c in mainline for uspace/srv/hw/irc/obio/obio.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/hw/irc/obio/obio.c (modified) (1 diff)

uspace/srv/hw/irc/obio/obio.c

@@ -124 +124 @@
         
         base_phys = (void *) paddr;
-        base_virt = as_get_mappable_page(OBIO_SIZE);
         
         int flags = AS_AREA_READ | AS_AREA_WRITE;
-        int retval = physmem_map(base_phys, (void *) base_virt,
-            ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags);
+        int retval = physmem_map(base_phys,
+            ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags,
+            (void *) &base_virt);
         
         if (retval < 0) {