Changeset 66fcba2 in mainline for kernel/arch/arm32/include

Timestamp:

2010-06-20T15:35:39Z (16 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/include

Files:

• mach/integratorcp/integratorcp.h (modified) (2 diffs)
• mach/testarm/testarm.h (modified) (2 diffs)
• machine_func.h (modified) (1 diff)

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. */