2 files changed, 10 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
index c8c558dc3d..75e2ec4750 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/bsp.h
@@ -22,6 +22,7 @@ extern "C" {
 #include <bspopts.h>
 
 #include <rtems.h>
+#include <rtems/bspIo.h>
 #include <clockdrv.h>
 #include <console.h>
 #include <iosupp.h>
@@ -35,6 +36,7 @@ extern "C" {
  *   - Interrupt stack space is not minimum if defined.
  */
 
+#define CONSOLE_SCI
 /* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */
 /* #define CONFIGURE_INTERRUPT_STACK_MEMORY  (TBD * 1024) */
 
@@ -102,7 +104,7 @@ extern char _copy_data_from_rom[];
 
 #define RAW_PUTS(str) \
   { register char *ptr = str; \
-    while (*ptr) outbyte(*ptr++); \
+    while (*ptr) SCI_output_char(*ptr++); \
   }
 
 #define RAW_PUTI(n) { \
@@ -111,7 +113,7 @@ extern char _copy_data_from_rom[];
     RAW_PUTS("0x"); \
     for (i=28;i>=0;i -= 4) { \
       j = (n>>i) & 0xf; \
-      outbyte( (j>9 ? j-10+'a' : j+'0') ); \
+      SCI_output_char( (j>9 ? j-10+'a' : j+'0') ); \
     } \
   }
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h
index c0ef0a7d6c..c7cbbfa797 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h
+++ b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h
@@ -33,7 +33,7 @@
 /* System Clock definitions */
 #define XTAL 32768.0		/* crystal frequency in Hz */
 
-#if 0
+#if 1
 /* Default MRM clock rate (8.388688 MHz) set by CPU32: */
 #define MRM_W 0			/* system clock parameters */
 #define MRM_X 0
@@ -47,7 +47,7 @@
 #define MRM_Y 0x0f
 #endif
 
-#if 1
+#if 0
 /* 25.16582 MHz: */
 #define MRM_W 1			/* system clock parameters */
 #define MRM_X 1
@@ -60,6 +60,8 @@
 
 /* macros/functions */
 
+#ifndef ASM
+
 /*
  *  This prototype really should have the noreturn attribute but
  *  that causes a warning. Not sure how to fix that. 
@@ -68,4 +70,6 @@
 static void reboot(void);
 __inline__ static void reboot() {asm("trap #15; .word 0x0063");}
 
+#endif /* ASM */
+
 #endif /* _MRM_H_ */