Changeset 0773396 in mainline for uspace/drv/fb/kfb/port.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/fb/kfb/port.c (modified) (1 diff)

uspace/drv/fb/kfb/port.c

@@ -333 +333 @@
         
         kfb.size = scanline * height;
-        rc = physmem_map((void *) paddr + offset,
+        rc = physmem_map(paddr + offset,
             ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
             AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);