Context Navigation

r99b2564	recf083dd
105	105	extern void icp_get_memory_extents(uintptr_t , uintptr_t );
106	106	extern void icp_frame_init(void);
	107	extern size_t icp_get_irq_count(void);
107	108
108	109	extern struct arm_machine_ops icp_machine_ops;

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

r99b2564	recf083dd
73	73	extern void gxemul_get_memory_extents(uintptr_t , uintptr_t );
74	74	extern void gxemul_frame_init(void);
	75	extern size_t gxemul_get_irq_count(void);
75	76
76	77	extern struct arm_machine_ops gxemul_machine_ops;

r99b2564	recf083dd
55	55	void (*machine_output_init)(void);
56	56	void (*machine_input_init)(void);
	57	size_t (*machine_get_irq_count)(void);
57	58	};
58	59

-              r99b2564
+              recf083dd
 static void gta02_output_init(void);
 static void gta02_input_init(void);
+static size_t gta02_get_irq_count(void);
 static void gta02_timer_irq_init(void);
 …
         gta02_frame_init,
         gta02_output_init,
+        gta02_input_init
+        gta02_input_init,
+        gta02_get_irq_count
 };
 …
+}
+size_t gta02_get_irq_count(void)
+{
+        return GTA02_IRQ_COUNT;
+}
 static void gta02_timer_irq_init(void)
+{

-              r99b2564
+              recf083dd
         icp_frame_init,
         icp_output_init,
+        icp_input_init
+        icp_input_init,
+        icp_get_irq_count
 };
 …
+}
+size_t icp_get_irq_count(void)
+{
+        return ICP_IRQ_COUNT;
+}
 /** @}

-              r99b2564
+              recf083dd
         gxemul_frame_init,
         gxemul_output_init,
+        gxemul_input_init
+        gxemul_input_init,
+        gxemul_get_irq_count
 };
 …
+}
+size_t gxemul_get_irq_count(void)
+{
+        return GXEMUL_IRQ_COUNT;
+}
 /** Starts gxemul Real Time Clock device, which asserts regular interrupts.
+ *

-              r99b2564
+              recf083dd
 size_t machine_get_irq_count(void)
+{
+        size_t irq_count;
+#if defined(MACHINE_gta02)
+        irq_count = GTA02_IRQ_COUNT;
+#elif defined(MACHINE_testarm)
+        irq_count = GXEMUL_IRQ_COUNT;
+#elif defined(MACHINE_integratorcp)
+        irq_count = ICP_IRQ_COUNT;
+#else
+#error Machine type not defined.
+#endif
+        return irq_count;
+        return (machine_ops->machine_get_irq_count)();
+}

Note: See TracChangeset for help on using the changeset viewer.