Changeset adec5b45 in mainline for kernel/genarch/src

Timestamp:

2012-01-27T22:19:12Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ccd0aa

Parents:

d4673296

Message:

Rename hw_map() to km_map() and add protection flags argument
to make it more generic.

Location:

kernel/genarch/src

Files:

• drivers/ega/ega.c (modified) (1 diff)
• drivers/s3c24xx_uart/s3c24xx_uart.c (modified) (1 diff)
• fb/fb.c (modified) (1 diff)

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

@@ -597 +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

@@ -114 +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

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