Changes in kernel/arch/arm32/src/mach/testarm/testarm.c [eff1f033:a71c158] in mainline

File:

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

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

@@ -56 +56 @@
 static irq_t gxemul_timer_irq;
 
-struct arm_machine_ops gxemul_machine_ops = {
+struct arm_machine_ops machine_ops = {
         gxemul_init,
         gxemul_timer_irq_start,
         gxemul_cpu_halt,
-        gxemul_get_memory_extents,
+        gxemul_get_memory_size,
         gxemul_irq_exception,
         gxemul_frame_init,
         gxemul_output_init,
-        gxemul_input_init,
-        gxemul_get_irq_count,
-        gxemul_get_platform_name
+        gxemul_input_init
 };
 
@@ -124 +122 @@
         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.virtual", NULL, (unative_t) gxemul_kbd);
 #endif
-}
-
-size_t gxemul_get_irq_count(void)
-{
-        return GXEMUL_IRQ_COUNT;
-}
-
-const char *gxemul_get_platform_name(void)
-{
-        return "gxemul";
 }
 
@@ -197 +185 @@
 }
 
-/** Get extents of available memory.
- *
- * @param start         Place to store memory start address.
- * @param size          Place to store memory size.
- */
-void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
-{
-        *start = 0;
-        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
-}
+/** Returns the size of emulated memory.
+ *
+ * @return Size in bytes.
+ */
+uintptr_t gxemul_get_memory_size(void)
+{
+        return  *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+}
+
 
 /** Returns the mask of active interrupts. */
@@ -218 +205 @@
  * Determines the sources of interrupt and calls their handlers.
  */
-void gxemul_irq_exception(unsigned int exc_no, istate_t *istate)
+void gxemul_irq_exception(int exc_no, istate_t *istate)
 {
         uint32_t sources = gxemul_irqc_get_sources();
         unsigned int i;
 
-        for (i = 0; i < GXEMUL_IRQ_COUNT; i++) {
+        for (i = 0; i < GXEMUL_IRQC_MAX_IRQ; i++) {
                 if (sources & (1 << i)) {
                         irq_t *irq = irq_dispatch_and_lock(i);