Changeset 1440eae in mainline for uspace/lib/fb/screenbuffer.c


Ignore:
Timestamp:
2011-12-22T12:04:54Z (14 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3819ce5
Parents:
65d7b0a (diff), a438de48 (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/fb/screenbuffer.c

    r65d7b0a r1440eae  
    7979       
    8080        if ((flags & SCREENBUFFER_FLAG_SHARED) == SCREENBUFFER_FLAG_SHARED) {
    81                 scrbuf = (screenbuffer_t *) as_get_mappable_page(size);
    82                
    83                 if (as_area_create((void *) scrbuf, size, AS_AREA_READ |
    84                     AS_AREA_WRITE | AS_AREA_CACHEABLE) != (void *) scrbuf)
     81                scrbuf = (screenbuffer_t *) as_area_create((void *) -1, size,
     82                    AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
     83                if (scrbuf == (void *) -1)
    8584                        return NULL;
    8685        } else {
Note: See TracChangeset for help on using the changeset viewer.