Changeset fe56c08a in mainline for kernel/genarch/src/drivers/ega/ega.c

Timestamp:

2012-01-28T09:17:24Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ca3d77a

Parents:

8da2c60 (diff), 9970a5a (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:

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

kernel/genarch/src/drivers/ega/ega.c

@@ -37 +37 @@
 #include <genarch/drivers/ega/ega.h>
 #include <putchar.h>
-#include <mm/page.h>
+#include <mm/km.h>
 #include <mm/as.h>
 #include <mm/slab.h>
-#include <arch/mm/page.h>
 #include <typedefs.h>
 #include <arch/asm.h>
@@ -598 +597 @@
         
         instance->base = base;
-        instance->addr = (uint8_t *) hw_map(addr, EGA_VRAM_SIZE);
+        instance->addr = (uint8_t *) km_map(addr, EGA_VRAM_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         if (!instance->addr) {
                 LOG("Unable to EGA video memory.");