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

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

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>
@@ -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);
 }
 
@@ -117 +121 @@
                 }
         }
-
+        
         /*
          * This is the necessary evil until the userspace driver is entirely
@@ -124 +128 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            GXEMUL_KBD_ADDRESS);
 #endif
 }
@@ -167 +172 @@
         clock();
         spinlock_lock(&irq->lock);
-
+        
         /* acknowledge tick */
         *((uint32_t *) (gxemul_rtc + GXEMUL_RTC_ACK_OFFSET))
@@ -176 +181 @@
 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);
 }
 
@@ -193 +198 @@
 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);
 }
 
@@ -202 +207 @@
  * @param size          Place to store memory size.
  */
-void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
+void gxemul_get_memory_extents(uintptr_t *start, size_t *size)
 {
         *start = 0;
-        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
 }
 
@@ -222 +227 @@
         uint32_t sources = gxemul_irqc_get_sources();
         unsigned int i;
-
+        
         for (i = 0; i < GXEMUL_IRQ_COUNT; i++) {
                 if (sources & (1 << i)) {