Changeset 00aece0 in mainline for kernel/genarch/src/fb/fb.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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:

• kernel/genarch/src/fb/fb.c (modified) (2 diffs)

kernel/genarch/src/fb/fb.c

@@ -40 +40 @@
 #include <console/console.h>
 #include <sysinfo/sysinfo.h>
-#include <mm/page.h>
+#include <mm/km.h>
 #include <mm/slab.h>
 #include <align.h>
@@ -587 +587 @@
         size_t glyphsize = FONT_GLYPHS * instance->glyphbytes;
         
-        instance->addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
+        instance->addr = (uint8_t *) km_map((uintptr_t) props->addr, fbsize,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         if (!instance->addr) {
                 LOG("Unable to map framebuffer.");