Changes in kernel/arch/mips32/src/mips32.c [2277e03:36df4109] in mainline

File:

• kernel/arch/mips32/src/mips32.c (modified) (7 diffs)

kernel/arch/mips32/src/mips32.c

@@ -34 +34 @@
 
 #include <arch.h>
+#include <arch/arch.h>
 #include <typedefs.h>
 #include <errno.h>
@@ -41 +42 @@
 #include <memstr.h>
 #include <userspace.h>
-#include <console/console.h>
 #include <syscall/syscall.h>
 #include <sysinfo/sysinfo.h>
 #include <arch/debug.h>
 #include <arch/debugger.h>
-#include <arch/drivers/msim.h>
-#include <genarch/fb/fb.h>
-#include <genarch/drivers/dsrln/dsrlnin.h>
-#include <genarch/drivers/dsrln/dsrlnout.h>
-#include <genarch/srln/srln.h>
+#include <arch/machine_func.h>
 
 /* Size of the code jumping to the exception handler code
@@ -61 +57 @@
 #define CACHE_EXC  ((char *) 0x80000100)
 
+static void mips32_pre_mm_init(void);
+static void mips32_post_mm_init(void);
+static void mips32_post_smp_init(void);
+
+arch_ops_t mips32_ops = {
+        .pre_mm_init = mips32_pre_mm_init,
+        .post_mm_init = mips32_post_mm_init,
+        .post_smp_init = mips32_post_smp_init,
+};
+
+arch_ops_t *arch_ops = &mips32_ops;
 
 /* Why the linker moves the variable 64K away in assembler
@@ -71 +78 @@
 size_t cpu_count = 0;
 
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+size_t sdram_size = 0;
+#endif
+
 /** Performs mips32-specific initialization before main_bsp() is called. */
-void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
+void mips32_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
         init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
@@ -88 +99 @@
                         cpu_count++;
         }
-}
-
-void arch_pre_mm_init(void)
+
+#if defined(MACHINE_lmalta) || defined(MACHINE_bmalta)
+        sdram_size = bootinfo->sdram_size;
+#endif
+
+        /* Initialize machine_ops pointer. */
+        machine_ops_init();
+}
+
+void mips32_pre_mm_init(void)
 {
         /* It is not assumed by default */
@@ -121 +139 @@
 }
 
-void arch_post_mm_init(void)
+void mips32_post_mm_init(void)
 {
         interrupt_init();
-        
-#ifdef CONFIG_FB
-        /* GXemul framebuffer */
-        fb_properties_t gxemul_prop = {
-                .addr = 0x12000000,
-                .offset = 0,
-                .x = 640,
-                .y = 480,
-                .scan = 1920,
-                .visual = VISUAL_RGB_8_8_8,
-        };
-        
-        outdev_t *fbdev = fb_init(&gxemul_prop);
-        if (fbdev)
-                stdout_wire(fbdev);
-#endif
-
-#ifdef CONFIG_MIPS_PRN
-        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
-        if (dsrlndev)
-                stdout_wire(dsrlndev);
-#endif
-}
-
-void arch_post_cpu_init(void)
-{
-}
-
-void arch_pre_smp_init(void)
-{
-}
-
-void arch_post_smp_init(void)
-{
-        static const char *platform;
-
+
+        machine_init();
+        machine_output_init();
+}
+
+void mips32_post_smp_init(void)
+{
         /* Set platform name. */
-#ifdef MACHINE_msim
-        platform = "msim";
-#endif
-#ifdef MACHINE_bgxemul
-        platform = "gxemul";
-#endif
-#ifdef MACHINE_lgxemul
-        platform = "gxemul";
-#endif
-        sysinfo_set_item_data("platform", NULL, (void *) platform,
-            str_size(platform));
-
-#ifdef CONFIG_MIPS_KBD
-        /*
-         * Initialize the msim/GXemul keyboard port. Then initialize the serial line
-         * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
-         */
-        dsrlnin_instance_t *dsrlnin_instance
-            = dsrlnin_init((dsrlnin_t *) MSIM_KBD_ADDRESS, MSIM_KBD_IRQ);
-        if (dsrlnin_instance) {
-                srln_instance_t *srln_instance = srln_init();
-                if (srln_instance) {
-                        indev_t *sink = stdin_wire();
-                        indev_t *srln = srln_wire(srln_instance, sink);
-                        dsrlnin_wire(dsrlnin_instance, srln);
-                        cp0_unmask_int(MSIM_KBD_IRQ);
-                }
-        }
-        
-        /*
-         * This is the necessary evil until the userspace driver is entirely
-         * self-sufficient.
-         */
-        sysinfo_set_item_val("kbd", NULL, true);
-        sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.physical", NULL,
-            PA2KA(MSIM_KBD_ADDRESS));
-#endif
+        sysinfo_set_item_data("platform", NULL,
+            (void *) machine_get_platform_name(),
+            str_size(machine_get_platform_name()));
+
+        machine_input_init();
 }
 
@@ -235 +191 @@
 }
 
-/** Set thread-local-storage pointer
- *
- * We have it currently in K1, it is
- * possible to have it separately in the future.
- */
-sysarg_t sys_tls_set(uintptr_t addr)
-{
-        return EOK;
-}
-
 void arch_reboot(void)
 {