Changeset 66fcba2 in mainline

Timestamp:

2010-06-20T15:35:39Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6b80696, 7c866dc

Parents:

5ac77cc

Message:

Do not decide which machine_ops to use at link time.

Location:

kernel/arch/arm32

Files:

• include/mach/integratorcp/integratorcp.h (modified) (2 diffs)
• include/mach/testarm/testarm.h (modified) (2 diffs)
• include/machine_func.h (modified) (1 diff)
• src/arm32.c (modified) (1 diff)
• src/mach/integratorcp/integratorcp.c (modified) (1 diff)
• src/mach/testarm/testarm.c (modified) (1 diff)
• src/machine_func.c (modified) (8 diffs)

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

@@ -36 +36 @@
  */
 
-#ifndef KERN_arm32_MACHINE_H_
-#define KERN_arm32_MACHINE_H_
+#ifndef KERN_arm32_icp_H_
+#define KERN_arm32_icp_H_
 
 #include <arch/machine_func.h>
@@ -106 +106 @@
 extern void icp_frame_init(void);
 
+extern struct arm_machine_ops icp_machine_ops;
+
 #endif
 

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

@@ -37 +37 @@
  */
 
-#ifndef KERN_arm32_MACHINE_H_
-#define KERN_arm32_MACHINE_H_
+#ifndef KERN_arm32_testarm_H_
+#define KERN_arm32_testarm_H_
 
 #include <arch/machine_func.h>
@@ -76 +76 @@
 extern void gxemul_frame_init(void);
 
+extern struct arm_machine_ops gxemul_machine_ops;
 
 #endif

kernel/arch/arm32/include/machine_func.h

@@ -57 +57 @@
 };
 
-extern struct arm_machine_ops machine_ops;
+/** Pointer to arm_machine_ops structure being used. */
+extern struct arm_machine_ops *machine_ops;
 
+/** Initialize machine_ops pointer. */
+extern void machine_ops_init(void);
 
 /** Maps HW devices to the kernel address space using #hw_map. */

kernel/arch/arm32/src/arm32.c

@@ -63 +63 @@
                     bootinfo->tasks[i].name);
         }
+
+        /* Initialize machine_ops pointer. */
+        machine_ops_init();
 }
 

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

@@ -56 +56 @@
 static icp_hw_map_t icp_hw_map;
 static irq_t icp_timer_irq;
-struct arm_machine_ops machine_ops = {
+struct arm_machine_ops icp_machine_ops = {
         icp_init,
         icp_timer_irq_start,

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

@@ -56 +56 @@
 static irq_t gxemul_timer_irq;
 
-struct arm_machine_ops machine_ops = {
+struct arm_machine_ops gxemul_machine_ops = {
         gxemul_init,
         gxemul_timer_irq_start,

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)();
 }
 
@@ -51 +67 @@
 void machine_timer_irq_start(void)
 {
-        (machine_ops.machine_timer_irq_start)();
+        (machine_ops->machine_timer_irq_start)();
 }
 
@@ -58 +74 @@
 void machine_cpu_halt(void)
 {
-        (machine_ops.machine_cpu_halt)();
+        (machine_ops->machine_cpu_halt)();
 }
 
@@ -68 +84 @@
 uintptr_t machine_get_memory_size(void)
 {
-        return (machine_ops.machine_get_memory_size)();
+        return (machine_ops->machine_get_memory_size)();
 }
 
@@ -78 +94 @@
 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);
 }
 
@@ -87 +103 @@
 void machine_frame_init(void)
 {
-        (machine_ops.machine_frame_init)();
+        (machine_ops->machine_frame_init)();
 }
 
@@ -95 +111 @@
 void machine_output_init(void)
 {
-        (machine_ops.machine_output_init)();
+        (machine_ops->machine_output_init)();
 }
 
@@ -103 +119 @@
 void machine_input_init(void)
 {
-        (machine_ops.machine_input_init)();
+        (machine_ops->machine_input_init)();
 }