Changes in kernel/arch/arm32/src/machine_func.c [66fcba2:214ec25c] in mainline

File:

• kernel/arch/arm32/src/machine_func.c (modified) (8 diffs)

kernel/arch/arm32/src/machine_func.c

@@ -39 +39 @@
 
 #include <arch/machine_func.h>
-#include <arch/mach/integratorcp/integratorcp.h>
-#include <arch/mach/testarm/testarm.h>
 
-/** Pointer to machine_ops structure being used. */
-struct arm_machine_ops *machine_ops;
-
-/** Initialize machine_ops pointer. */
-void machine_ops_init(void)
-{
-#if defined(MACHINE_testarm)
-        machine_ops = &gxemul_machine_ops;
-#elif defined(MACHINE_integratorcp)
-        machine_ops = &icp_machine_ops;
-#else
-#error Machine type not defined.
-#endif
-}
 
 /** Maps HW devices to the kernel address space using #hw_map. */
 void machine_init(void)
 {
-        (machine_ops->machine_init)();
+        (machine_ops.machine_init)();
 }
 
@@ -67 +51 @@
 void machine_timer_irq_start(void)
 {
-        (machine_ops->machine_timer_irq_start)();
+        (machine_ops.machine_timer_irq_start)();
 }
 
@@ -74 +58 @@
 void machine_cpu_halt(void)
 {
-        (machine_ops->machine_cpu_halt)();
+        (machine_ops.machine_cpu_halt)();
 }
 
@@ -84 +68 @@
 uintptr_t machine_get_memory_size(void)
 {
-        return (machine_ops->machine_get_memory_size)();
+        return (machine_ops.machine_get_memory_size)();
 }
 
@@ -94 +78 @@
 void machine_irq_exception(unsigned int exc_no, istate_t *istate)
 {
-        (machine_ops->machine_irq_exception)(exc_no, istate);
+        (machine_ops.machine_irq_exception)(exc_no, istate);
 }
 
@@ -103 +87 @@
 void machine_frame_init(void)
 {
-        (machine_ops->machine_frame_init)();
+        (machine_ops.machine_frame_init)();
 }
 
@@ -111 +95 @@
 void machine_output_init(void)
 {
-        (machine_ops->machine_output_init)();
+        (machine_ops.machine_output_init)();
 }
 
@@ -119 +103 @@
 void machine_input_init(void)
 {
-        (machine_ops->machine_input_init)();
+        (machine_ops.machine_input_init)();
+}
+
+/*
+ * Generic function to use, if sepcific function doesn't define any of the above functions.
+ */
+void machine_genfunc()
+{
 }