Changeset b7068da in mainline for uspace/srv/hid/fb/port/kchar.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/fb/port/kchar.c (modified) (1 diff)

uspace/srv/hid/fb/port/kchar.c

@@ -83 +83 @@
                 return rc;
         
-        kchar.addr = as_get_mappable_page(1);
-        if (kchar.addr == NULL)
-                return ENOMEM;
-        
-        rc = physmem_map((void *) paddr, kchar.addr,
-            ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        rc = physmem_map((void *) paddr,
+            ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &kchar.addr);
         if (rc != EOK)
                 return rc;