Changeset 260f678 in mainline

Timestamp:

2013-02-04T10:42:50Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b5e17b1

Parents:

ae7ba7b6

Message:

Factor out stdin/stdout initialization into machine ops.

Location:

kernel/arch/mips32/src

Files:

• mach/msim/msim.c (modified) (2 diffs)
• mips32.c (modified) (4 diffs)

kernel/arch/mips32/src/mach/msim/msim.c

@@ -35 +35 @@
 
 #include <arch/mach/msim/msim.h>
+#include <console/console.h>
+#include <sysinfo/sysinfo.h>
+#include <arch/drivers/msim.h>
+#include <genarch/drivers/dsrln/dsrlnin.h>
+#include <genarch/drivers/dsrln/dsrlnout.h>
+#include <genarch/srln/srln.h>
 
 static void msim_init(void);
@@ -72 +78 @@
 void msim_output_init(void)
 {
+#ifdef CONFIG_MSIM_PRN
+        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
+        if (dsrlndev)
+                stdout_wire(dsrlndev);
+#endif
 }
 
 void msim_input_init(void)
 {
+#ifdef CONFIG_MSIM_KBD
+        /*
+         * Initialize the msim keyboard port. Then initialize the serial line
+         * module and connect it to the msim 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
 }
 

kernel/arch/mips32/src/mips32.c

@@ -41 +41 @@
 #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>
-#ifdef MACHINE_msim
-#include <arch/drivers/msim.h>
-#endif
-#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>
 
@@ -99 +91 @@
         sdram_size = bootinfo->sdram_size;
 #endif
+
+        /* Initialize machine_ops pointer. */
+        machine_ops_init();
 }
 
@@ -135 +130 @@
 {
         interrupt_init();
-        
-#ifdef CONFIG_MSIM_PRN
-        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
-        if (dsrlndev)
-                stdout_wire(dsrlndev);
-#endif
+
+        machine_init();
+        machine_output_init();
 }
 
@@ -158 +150 @@
             str_size(machine_get_platform_name()));
 
-#ifdef CONFIG_MSIM_KBD
-        /*
-         * Initialize the msim keyboard port. Then initialize the serial line
-         * module and connect it to the msim 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
+        machine_input_init();
 }