Changes in kernel/arch/ppc32/src/ppc32.c [36df4109:20f8111] in mainline

File:

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

kernel/arch/ppc32/src/ppc32.c

@@ -33 +33 @@
  */
 
+#include <config.h>
 #include <arch.h>
-#include <arch/arch.h>
-#include <config.h>
 #include <arch/boot/boot.h>
 #include <genarch/drivers/via-cuda/cuda.h>
@@ -48 +47 @@
 #include <mm/page.h>
 #include <mm/km.h>
-#include <time/clock.h>
 #include <abi/proc/uarg.h>
 #include <console/console.h>
@@ -62 +60 @@
 #define IRQ_CUDA   10
 
-static void ppc32_pre_mm_init(void);
-static void ppc32_post_mm_init(void);
-static void ppc32_post_smp_init(void);
-
-arch_ops_t ppc32_ops = {
-        .pre_mm_init = ppc32_pre_mm_init,
-        .post_mm_init = ppc32_post_mm_init,
-        .post_smp_init = ppc32_post_smp_init,
-};
-
-arch_ops_t *arch_ops = &ppc32_ops;
-
 bootinfo_t bootinfo;
 
@@ -80 +66 @@
 
 /** Performs ppc32-specific initialization before main_bsp() is called. */
-void ppc32_pre_main(bootinfo_t *bootinfo)
+void arch_pre_main(bootinfo_t *bootinfo)
 {
         /* Copy tasks map. */
@@ -108 +94 @@
 }
 
-void ppc32_pre_mm_init(void)
+void arch_pre_mm_init(void)
 {
         /* Initialize dispatch table */
         interrupt_init();
         
-        ofw_tree_node_t *cpus_node;
-        ofw_tree_node_t *cpu_node;
-        ofw_tree_property_t *freq_prop;
-
-        cpus_node = ofw_tree_lookup("/cpus");
-        if (!cpus_node)
-                panic("Could not find cpus node.");
-
-        cpu_node = cpus_node->child;
-        if (!cpu_node)
-                panic("Could not find first cpu.");     
-
-        freq_prop = ofw_tree_getprop(cpu_node, "timebase-frequency");
-        if (!freq_prop)
-                panic("Could not get frequency property.");
-
-        uint32_t freq;
-        freq = *((uint32_t *) freq_prop->value);
-
         /* Start decrementer */
-        decrementer_start(freq / HZ);
+        start_decrementer();
 }
 
@@ -205 +172 @@
 #endif
 
-void ppc32_post_mm_init(void)
+void arch_post_mm_init(void)
 {
         if (config.cpu_active == 1) {
@@ -220 +187 @@
                 zone_merge_all();
         }
+}
+
+void arch_post_cpu_init(void)
+{
+}
+
+void arch_pre_smp_init(void)
+{
 }
 
@@ -278 +253 @@
 }
 
-void ppc32_post_smp_init(void)
+void arch_post_smp_init(void)
 {
         /* Currently the only supported platform for ppc32 is 'mac'. */