From 6923ca9fdad24d618cb6dcf5d2e48e20ce298a2f Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Sat, 20 Jun 2015 11:57:43 -0400
Subject: [PATCH] RTEMS: conditional fixups for pc386

---
 src/libCom/RTEMS/Makefile     |  3 +++
 src/libCom/RTEMS/rtems_init.c | 37 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/src/libCom/RTEMS/Makefile b/src/libCom/RTEMS/Makefile
index 8d467b260..2f12b7bf0 100644
--- a/src/libCom/RTEMS/Makefile
+++ b/src/libCom/RTEMS/Makefile
@@ -12,6 +12,9 @@ include $(TOP)/configure/CONFIG
 INC += epicsRtemsInitHooks.h
 INC += epicsMemFs.h
 
+ifeq ($(RTEMS_QEMU_FIXUPS),YES)
+rtems_init_CPPFLAGS += -DQEMU_FIXUPS
+endif
 rtemsCom_SRCS += rtems_init.c
 rtemsCom_SRCS += rtems_config.c
 rtemsCom_SRCS += rtems_netconfig.c
diff --git a/src/libCom/RTEMS/rtems_init.c b/src/libCom/RTEMS/rtems_init.c
index 4e8298a29..7dbf2594f 100644
--- a/src/libCom/RTEMS/rtems_init.c
+++ b/src/libCom/RTEMS/rtems_init.c
@@ -33,6 +33,7 @@
 #include <librtemsNfs.h>
 #include <bsp.h>
 
+#include "epicsVersion.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
 #include "epicsExit.h"
@@ -46,6 +47,8 @@
 
 #include "epicsRtemsInitHooks.h"
 
+#define RTEMS_VERSION_INT  VERSION_INT(__RTEMS_MAJOR__, __RTEMS_MINOR__, 0, 0)
+
 /*
  * Prototypes for some functions not in header files
  */
@@ -695,3 +698,37 @@ Init (rtems_task_argument ignored)
     epicsThreadSleep(1.0);
     epicsExit(result);
 }
+
+#if defined(QEMU_FIXUPS)
+/* Override some hooks (weak symbols)
+ * if BSP defaults aren't configured for running tests.
+ */
+
+
+/* Ensure that stdio goes to serial (so it can be captured) */
+#if defined(__i386__) && !USE_COM1_AS_CONSOLE
+#include <uart.h>
+extern int BSPPrintkPort;
+void bsp_predriver_hook(void)
+{
+    BSPConsolePort = BSP_CONSOLE_PORT_COM1;
+    BSPPrintkPort = BSP_CONSOLE_PORT_COM1;
+}
+#endif
+
+/* reboot immediately when done. */
+#if defined(__i386__) && BSP_PRESS_KEY_FOR_RESET
+void bsp_cleanup(void)
+{
+#if RTEMS_VERSION_INT>=VERSION_INT(4,10,0,0)
+    void bsp_reset();
+    bsp_reset();
+#else
+    rtemsReboot();
+#endif
+}
+#endif
+
+#endif /* QEMU_FIXUPS */
+
+int cexpdebug __attribute__((weak));