Changeset 3c50cddc in mainline

Timestamp:

2012-12-19T21:13:56Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a522999

Parents:

7633928c

Message:

Use msim printer and kayboard only for the msim machine.

Files:

• HelenOS.config (modified) (2 diffs)
• kernel/arch/mips32/src/mips32.c (modified) (3 diffs)
• kernel/arch/mips32/src/mm/frame.c (modified) (1 diff)
• kernel/arch/mips64/src/mips64.c (modified) (3 diffs)
• kernel/arch/mips64/src/mm/frame.c (modified) (1 diff)

HelenOS.config

@@ -447 +447 @@
 
 % Support for msim keyboard
-! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n)
+! [CONFIG_HID_IN=generic&MACHINE=msim] CONFIG_MSIM_KBD (y/n)
 
 % Support for msim printer
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n)
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&MACHINE=msim] CONFIG_MSIM_PRN (y/n)
 
 % Support for VIA CUDA controller
@@ -486 +486 @@
 
 % Dummy serial line input
-! [CONFIG_MIPS_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
+! [CONFIG_MSIM_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
 
 % Dummy serial line output
-! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
+! [CONFIG_MSIM_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
 
 % Serial line input module

kernel/arch/mips32/src/mips32.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>
@@ -133 +135 @@
         interrupt_init();
         
-#ifdef CONFIG_MIPS_PRN
+#ifdef CONFIG_MSIM_PRN
         outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
         if (dsrlndev)
@@ -162 +164 @@
             str_size(platform));
 
-#ifdef CONFIG_MIPS_KBD
+#ifdef CONFIG_MSIM_KBD
         /*
          * Initialize the msim keyboard port. Then initialize the serial line

kernel/arch/mips32/src/mm/frame.c

@@ -40 +40 @@
 #include <mm/asid.h>
 #include <config.h>
+#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
+#endif
 #include <arch/arch.h>
 #include <print.h>

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
+#ifdef CONFIG_MSIM_KBD
         /*
          * Initialize the msim keyboard port. Then initialize the serial line

kernel/arch/mips64/src/mm/frame.c

@@ -40 +40 @@
 #include <mm/asid.h>
 #include <config.h>
+#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
+#endif
 #include <print.h>