Changeset 6843a9c in mainline for uspace/lib/fb/screenbuffer.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/lib/fb/screenbuffer.c (modified) (1 diff)

uspace/lib/fb/screenbuffer.c

@@ -79 +79 @@
         
         if ((flags & SCREENBUFFER_FLAG_SHARED) == SCREENBUFFER_FLAG_SHARED) {
-                scrbuf = (screenbuffer_t *) as_get_mappable_page(size);
-                
-                if (as_area_create((void *) scrbuf, size, AS_AREA_READ |
-                    AS_AREA_WRITE | AS_AREA_CACHEABLE) != (void *) scrbuf)
+                scrbuf = (screenbuffer_t *) as_area_create(AS_AREA_ANY, size,
+                    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+                if (scrbuf == AS_MAP_FAILED)
                         return NULL;
         } else {