Changeset 6843a9c in mainline for uspace/srv/hid/fb/port/kfb.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/srv/hid/fb/port/kfb.c (modified) (3 diffs)

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

@@ -409 +409 @@
         charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row);
         
-        pixel_t bgcolor;
-        pixel_t fgcolor;
+        pixel_t bgcolor = 0;
+        pixel_t fgcolor = 0;
         attrs_rgb(field->attrs, &bgcolor, &fgcolor);
         
@@ -525 +525 @@
         }
         
-        pixel_t bgcolor;
-        pixel_t fgcolor;
+        pixel_t bgcolor = 0;
+        pixel_t fgcolor = 0;
         attrs_rgb(vp->attrs, &bgcolor, &fgcolor);
         
@@ -756 +756 @@
         
         kfb.size = scanline * height;
-        kfb.addr = as_get_mappable_page(kfb.size);
-        if (kfb.addr == NULL) {
-                free(kfb.glyphs);
-                return ENOMEM;
-        }
-        
-        rc = physmem_map((void *) paddr + offset, kfb.addr,
-            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+        
+        rc = physmem_map((void *) paddr + offset,
+            ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &kfb.addr);
         if (rc != EOK) {
                 free(kfb.glyphs);