Changeset 36df4109 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2016-06-06T16:29:56Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7510326

Parents:

7f0580d

Message:

Introduce architecure-specific operations

This replaces the arch_*_init() functions with an arch_ops_t structure
defined for each architecture. Undefined operations are treated as NOPs.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -34 +34 @@
 
 #include <arch.h>
+#include <arch/arch.h>
 #include <typedefs.h>
 #include <errno.h>
@@ -64 +65 @@
 #endif
 
+static void amd64_pre_mm_init(void);
+static void amd64_post_mm_init(void);
+static void amd64_post_cpu_init(void);
+static void amd64_pre_smp_init(void);
+static void amd64_post_smp_init(void);
+
+arch_ops_t amd64_ops = {
+        .pre_mm_init = amd64_pre_mm_init,
+        .post_mm_init = amd64_post_mm_init,
+        .post_cpu_init = amd64_post_cpu_init,
+        .pre_smp_init = amd64_pre_smp_init,
+        .post_smp_init = amd64_post_smp_init
+};
+
+arch_ops_t *arch_ops = &amd64_ops;
+
 /** Perform amd64-specific initialization before main_bsp() is called.
  *
@@ -70 +87 @@
  *
  */
-void arch_pre_main(uint32_t signature, void *info)
+void amd64_pre_main(uint32_t signature, void *info)
 {
         /* Parse multiboot information obtained from the bootloader. */
@@ -83 +100 @@
 }
 
-void arch_pre_mm_init(void)
+void amd64_pre_mm_init(void)
 {
         /* Enable no-execute pages */
@@ -107 +124 @@
 }
 
-
-void arch_post_mm_init(void)
+void amd64_post_mm_init(void)
 {
         vreg_init();
@@ -144 +160 @@
 }
 
-void arch_post_cpu_init(void)
+void amd64_post_cpu_init(void)
 {
 #ifdef CONFIG_SMP
@@ -154 +170 @@
 }
 
-void arch_pre_smp_init(void)
+void amd64_pre_smp_init(void)
 {
         if (config.cpu_active == 1) {
@@ -163 +179 @@
 }
 
-void arch_post_smp_init(void)
+void amd64_post_smp_init(void)
 {
         /* Currently the only supported platform for amd64 is 'pc'. */