Changes in kernel/arch/arm32/src/mach/testarm/testarm.c [0e56575d:c0699467] in mainline

File:

• kernel/arch/arm32/src/mach/testarm/testarm.c (modified) (9 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>
@@ -72 +71 @@
 void gxemul_init(void)
 {
-        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);
+        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);
 }
 
@@ -121 +117 @@
                 }
         }
-        
+
         /*
          * This is the necessary evil until the userspace driver is entirely
@@ -128 +124 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.physical", NULL,
-            GXEMUL_KBD_ADDRESS);
+        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
 #endif
 }
@@ -172 +167 @@
         clock();
         spinlock_lock(&irq->lock);
-        
+
         /* acknowledge tick */
         *((uint32_t *) (gxemul_rtc + GXEMUL_RTC_ACK_OFFSET))
@@ -181 +176 @@
 static void gxemul_timer_irq_init(void)
 {
-        irq_initialize(&gxemul_timer_irq);
-        gxemul_timer_irq.devno = device_assign_devno();
-        gxemul_timer_irq.inr = GXEMUL_TIMER_IRQ;
-        gxemul_timer_irq.claim = gxemul_timer_claim;
-        gxemul_timer_irq.handler = gxemul_timer_irq_handler;
-        
-        irq_register(&gxemul_timer_irq);
+        irq_initialize(&gxemul_timer_irq);
+        gxemul_timer_irq.devno = device_assign_devno();
+        gxemul_timer_irq.inr = GXEMUL_TIMER_IRQ;
+        gxemul_timer_irq.claim = gxemul_timer_claim;
+        gxemul_timer_irq.handler = gxemul_timer_irq_handler;
+
+        irq_register(&gxemul_timer_irq);
 }
 
@@ -198 +193 @@
 void gxemul_timer_irq_start(void)
 {
-        gxemul_timer_irq_init();
-        gxemul_timer_start(GXEMUL_TIMER_FREQ);
+        gxemul_timer_irq_init();
+        gxemul_timer_start(GXEMUL_TIMER_FREQ);
 }
 
@@ -207 +202 @@
  * @param size          Place to store memory size.
  */
-void gxemul_get_memory_extents(uintptr_t *start, size_t *size)
+void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
 {
         *start = 0;
-        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
 }
 
@@ -227 +222 @@
         uint32_t sources = gxemul_irqc_get_sources();
         unsigned int i;
-        
+
         for (i = 0; i < GXEMUL_IRQ_COUNT; i++) {
                 if (sources & (1 << i)) {