aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2015-06-19 19:55:40 +0200
committerJoel Bodenmann <joel@seriouslyembedded.com>2015-06-19 19:55:40 +0200
commit3e021b9da3bfb04f662956b84a862ad0ac812da6 (patch)
treeae6c855258d95587bdf80190353e6b6b802fa91e
parent90d811dc7dced8fec1c331d4c0ced9fa65354c8e (diff)
downloaduGFX-3e021b9da3bfb04f662956b84a862ad0ac812da6.tar.gz
uGFX-3e021b9da3bfb04f662956b84a862ad0ac812da6.tar.bz2
uGFX-3e021b9da3bfb04f662956b84a862ad0ac812da6.zip
Fixing ChibiOS/RT 3.x port
-rw-r--r--src/gos/gos_chibios.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h
index a4880c16..c4755020 100644
--- a/src/gos/gos_chibios.h
+++ b/src/gos/gos_chibios.h
@@ -93,14 +93,15 @@ extern "C" {
#define gfxMutexInit(pmutex) chMtxInit(pmutex)
#define gfxMutexExit(pmutex) chMtxUnlock()
#define gfxExit() chSysHalt()
+ #define gfxHalt(msg) { chDbgPanic(msg); chSysHalt(); }
#elif CH_KERNEL_MAJOR == 3
#define gfxSystemTicks() chVTGetSystemTimeX()
#define gfxMutexInit(pmutex) chMtxObjectInit(pmutex)
#define gfxMutexExit(pmutex) chMtxUnlock(pmutex)
#define gfxExit() osalSysHalt("gfx_exit")
+#define gfxHalt(msg) { chSysHalt(msg); }
#endif
-#define gfxHalt(msg) { chDbgPanic(msg); chSysHalt(); }
#define gfxAlloc(sz) chHeapAlloc(0, sz)
#define gfxFree(ptr) chHeapFree(ptr)
#define gfxYield() chThdYield()