Changeset 7943c43 in mainline for uspace/srv/hid/fb/port/ega.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/ega.c (modified) (1 diff)

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

@@ -280 +280 @@
         
         ega.size = (width * height) << 1;
-        ega.addr = as_get_mappable_page(ega.size);
-        if (ega.addr == NULL)
-                return ENOMEM;
-        
-        rc = physmem_map((void *) paddr, ega.addr,
-            ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        
+        rc = physmem_map((void *) paddr,
+            ALIGN_UP(ega.size, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &ega.addr);
         if (rc != EOK)
                 return rc;