diff options
Diffstat (limited to 'os/rt/include')
| -rw-r--r-- | os/rt/include/chdebug.h | 20 | ||||
| -rw-r--r-- | os/rt/include/chqueues.h | 6 | ||||
| -rw-r--r-- | os/rt/include/chschd.h | 6 | ||||
| -rw-r--r-- | os/rt/include/chsys.h | 2 |
4 files changed, 9 insertions, 25 deletions
diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h index 836645f07..c33d078d3 100644 --- a/os/rt/include/chdebug.h +++ b/os/rt/include/chdebug.h @@ -71,13 +71,6 @@ /* Derived constants and error checks. */
/*===========================================================================*/
-#if CH_DBG_ENABLE_ASSERTS || CH_DBG_ENABLE_CHECKS || \
- CH_DBG_ENABLE_STACK_CHECK || CH_DBG_SYSTEM_STATE_CHECK
-#define CH_DBG_ENABLED TRUE
-#else
-#define CH_DBG_ENABLED FALSE
-#endif
-
/*===========================================================================*/
/* Module data structures and types. */
/*===========================================================================*/
@@ -159,12 +152,6 @@ typedef struct { #define _dbg_trace(otp)
#endif
-/* When the debug features are disabled this function is replaced by an empty
- macro.*/
-#if !CH_DBG_ENABLED
-#define chDbgPanic(msg) {}
-#endif
-
/**
* @name Macro Functions
* @{
@@ -183,7 +170,7 @@ typedef struct { #if !defined(chDbgCheck)
#define chDbgCheck(c) { \
if (!(c)) \
- chDbgPanic("C:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
+ chSysHalt("C:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
}
#endif /* !defined(chDbgCheck) */
@@ -209,7 +196,7 @@ typedef struct { #if !defined(chDbgAssert)
#define chDbgAssert(c, r) { \
if (!(c)) \
- chDbgPanic("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
+ chSysHalt("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__)); \
}
#endif /* !defined(chDbgAssert) */
#else /* !CH_DBG_ENABLE_ASSERTS */
@@ -241,9 +228,6 @@ extern "C" { void _trace_init(void);
void _dbg_trace(thread_t *otp);
#endif
-#if CH_DBG_ENABLED
- void chDbgPanic(const char *msg);
-#endif
#ifdef __cplusplus
}
#endif
diff --git a/os/rt/include/chqueues.h b/os/rt/include/chqueues.h index c050285ac..1cf778d3f 100644 --- a/os/rt/include/chqueues.h +++ b/os/rt/include/chqueues.h @@ -39,9 +39,9 @@ * @name Queue functions returned status value
* @{
*/
-#define Q_OK RDY_OK /**< @brief Operation successful. */
-#define Q_TIMEOUT RDY_TIMEOUT /**< @brief Timeout condition. */
-#define Q_RESET RDY_RESET /**< @brief Queue has been reset. */
+#define Q_OK MSG_OK /**< @brief Operation successful. */
+#define Q_TIMEOUT MSG_TIMEOUT /**< @brief Timeout condition. */
+#define Q_RESET MSG_RESET /**< @brief Queue has been reset. */
#define Q_EMPTY -3 /**< @brief Queue empty. */
#define Q_FULL -4 /**< @brief Queue full, */
/** @} */
diff --git a/os/rt/include/chschd.h b/os/rt/include/chschd.h index 248f707c8..b4160acc6 100644 --- a/os/rt/include/chschd.h +++ b/os/rt/include/chschd.h @@ -37,10 +37,10 @@ * @name Wakeup status codes
* @{
*/
-#define RDY_OK 0 /**< @brief Normal wakeup message. */
-#define RDY_TIMEOUT -1 /**< @brief Wakeup caused by a timeout
+#define MSG_OK 0 /**< @brief Normal wakeup message. */
+#define MSG_TIMEOUT -1 /**< @brief Wakeup caused by a timeout
condition. */
-#define RDY_RESET -2 /**< @brief Wakeup caused by a reset
+#define MSG_RESET -2 /**< @brief Wakeup caused by a reset
condition. */
/** @} */
diff --git a/os/rt/include/chsys.h b/os/rt/include/chsys.h index 475e090bd..5d6ce62aa 100644 --- a/os/rt/include/chsys.h +++ b/os/rt/include/chsys.h @@ -216,7 +216,7 @@ extern "C" {
#endif
void chSysInit(void);
- void chSysHalt(void);
+ void chSysHalt(const char *reason);
void chSysTimerHandlerI(void);
syssts_t chSysGetAndLockX(void);
void chSysRestoreLockX(syssts_t sts);
|