Changeset 0c2d9bb in mainline for uspace/srv/hid/output/port/ega.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/srv/hid/output/port/ega.c (modified) (1 diff)

uspace/srv/hid/output/port/ega.c

@@ -216 +216 @@
         ega.size = (ega.cols * ega.rows) << 1;
         
-        rc = physmem_map((void *) paddr,
+        rc = physmem_map(paddr,
             ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH,
             AS_AREA_READ | AS_AREA_WRITE, (void *) &ega.addr);