Changes in kernel/arch/mips64/src/mips64.c [3c50cddc:2277e03] in mainline

File:

• kernel/arch/mips64/src/mips64.c (modified) (4 diffs)

kernel/arch/mips64/src/mips64.c

@@ -46 +46 @@
 #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>
@@ -127 +125 @@
         interrupt_init();
         
-#ifdef CONFIG_MSIM_PRN
+#ifdef CONFIG_MIPS_PRN
         outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
         if (dsrlndev)
@@ -153 +151 @@
             str_size(platform));
         
-#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.
+#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
@@ -208 +205 @@
 {
         supervisor_sp =
-            (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA];
+            (uintptr_t) &THREAD->kstack[STACK_SIZE];
 }