Changes in kernel/arch/arm32/include/mach/testarm/testarm.h [ecf083dd:a71c158] in mainline

File:

• kernel/arch/arm32/include/mach/testarm/testarm.h (modified) (2 diffs)

kernel/arch/arm32/include/mach/testarm/testarm.h

@@ -37 +37 @@
  */
 
-#ifndef KERN_arm32_testarm_H_
-#define KERN_arm32_testarm_H_
+#ifndef KERN_arm32_MACHINE_H_
+#define KERN_arm32_MACHINE_H_
 
 #include <arch/machine_func.h>
 
-/** Size of GXemul IRQ number range (starting from 0) */
-#define GXEMUL_IRQ_COUNT        32
-#define GXEMUL_KBD_IRQ          2
-#define GXEMUL_TIMER_IRQ        4
+/** Last interrupt number (beginning from 0) whose status is probed
+ * from interrupt controller
+ */
+#define GXEMUL_IRQC_MAX_IRQ  8
+#define GXEMUL_KBD_IRQ       2
+#define GXEMUL_TIMER_IRQ     4
 
 /** Timer frequency */
@@ -70 +72 @@
 extern void gxemul_timer_irq_start(void);
 extern void gxemul_cpu_halt(void);
-extern void gxemul_irq_exception(unsigned int, istate_t *);
-extern void gxemul_get_memory_extents(uintptr_t *, uintptr_t *);
+extern void gxemul_irq_exception(int exc_no, istate_t *istate);
+extern uintptr_t gxemul_get_memory_size(void);
 extern void gxemul_frame_init(void);
-extern size_t gxemul_get_irq_count(void);
 
-extern struct arm_machine_ops gxemul_machine_ops;
 
 #endif