Changeset fe56c08a in mainline for kernel/arch/arm32/src/mach/testarm/testarm.c

Timestamp:

2012-01-28T09:17:24Z (13 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/arch/arm32/src/mach/testarm/testarm.c (modified) (2 diffs)

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -37 +37 @@
 #include <arch/mach/testarm/testarm.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <genarch/fb/fb.h>
 #include <abi/fb/visuals.h>
@@ -71 +72 @@
 void gxemul_init(void)
 {
-        gxemul_kbd = (void *) hw_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE);
-        gxemul_rtc = (void *) hw_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE);
-        gxemul_irqc = (void *) hw_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE);
+        gxemul_kbd = (void *) km_map(GXEMUL_KBD_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        gxemul_rtc = (void *) km_map(GXEMUL_RTC_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+        gxemul_irqc = (void *) km_map(GXEMUL_IRQC_ADDRESS, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 }