Changeset b183ce0a in mainline for kernel/arch/mips64/src/mips64.c

Timestamp:

2013-03-24T15:34:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8a26f82

Parents:

b92a0ee (diff), 119b46e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/mips64/src/mips64.c (modified) (3 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>
@@ -125 +127 @@
         interrupt_init();
         
-#ifdef CONFIG_MIPS_PRN
+#ifdef CONFIG_MSIM_PRN
         outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
         if (dsrlndev)
@@ -151 +153 @@
             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.
+#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