Changeset 9970a5a in mainline for kernel/genarch

Timestamp:

2012-01-27T23:24:27Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b3b571, fe56c08a

Parents:

d81eaf94 (diff), 221c9ec (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 from lp:~jakub/helenos/mm.

Location:

kernel/genarch/src

Files:

• drivers/ega/ega.c (modified) (2 diffs)
• drivers/s3c24xx_uart/s3c24xx_uart.c (modified) (2 diffs)
• fb/fb.c (modified) (2 diffs)
• multiboot/multiboot.c (modified) (1 diff)
• multiboot/multiboot2.c (modified) (1 diff)

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.");

kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c

@@ -45 +45 @@
 #include <mm/slab.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <sysinfo/sysinfo.h>
 #include <str.h>
@@ -113 +114 @@
         uart_dev->data = uart;
 
-        uart->io = (s3c24xx_uart_io_t *) hw_map(paddr, PAGE_SIZE);
+        uart->io = (s3c24xx_uart_io_t *) km_map(paddr, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         uart->indev = NULL;
 

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.");

kernel/genarch/src/multiboot/multiboot.c

@@ -77 +77 @@
                         break;
                 
-                init.tasks[init.cnt].addr = PA2KA(mods[i].start);
+                init.tasks[init.cnt].paddr = mods[i].start;
                 init.tasks[init.cnt].size = mods[i].end - mods[i].start;
                 

kernel/genarch/src/multiboot/multiboot2.c

@@ -45 +45 @@
 {
         if (init.cnt < CONFIG_INIT_TASKS) {
-                init.tasks[init.cnt].addr = PA2KA(module->start);
+                init.tasks[init.cnt].paddr = module->start;
                 init.tasks[init.cnt].size = module->end - module->start;
                 multiboot_extract_command(init.tasks[init.cnt].name,