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

File:

• kernel/arch/arm32/src/mach/testarm/testarm.c (modified) (6 diffs)

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

@@ -121 +121 @@
                 }
         }
-
+        
         /*
          * This is the necessary evil until the userspace driver is entirely
@@ -128 +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
 }
@@ -171 +172 @@
         clock();
         spinlock_lock(&irq->lock);
-
+        
         /* acknowledge tick */
         *((uint32_t *) (gxemul_rtc + GXEMUL_RTC_ACK_OFFSET))
@@ -180 +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);
 }
 
@@ -197 +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);
 }
 
@@ -226 +227 @@
         uint32_t sources = gxemul_irqc_get_sources();
         unsigned int i;
-
+        
         for (i = 0; i < GXEMUL_IRQ_COUNT; i++) {
                 if (sources & (1 << i)) {