diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-05 10:47:57 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-04-05 10:47:57 +0000 |
| commit | ce4f94eff6a85bd8c93794d0413316e347614f2c (patch) | |
| tree | 26b478e9b9703465642e5e5a0f8300a72c888831 /os/rt/src | |
| parent | fbb8e866760c1bc605422c92eef756903e5d63df (diff) | |
| download | ChibiOS-ce4f94eff6a85bd8c93794d0413316e347614f2c.tar.gz ChibiOS-ce4f94eff6a85bd8c93794d0413316e347614f2c.tar.bz2 ChibiOS-ce4f94eff6a85bd8c93794d0413316e347614f2c.zip | |
Renamed internal tracer functions.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9242 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/src')
| -rw-r--r-- | os/rt/src/chsys.c | 6 | ||||
| -rw-r--r-- | os/rt/src/chtrace.c | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/os/rt/src/chsys.c b/os/rt/src/chsys.c index 0702b7c18..1d3c7eff6 100644 --- a/os/rt/src/chsys.c +++ b/os/rt/src/chsys.c @@ -101,6 +101,7 @@ void chSysInit(void) { _scheduler_init();
_vt_init();
+ _trace_init();
#if CH_DBG_SYSTEM_STATE_CHECK == TRUE
ch.dbg.isr_cnt = (cnt_t)0;
@@ -118,9 +119,6 @@ void chSysInit(void) { #if CH_DBG_STATISTICS == TRUE
_stats_init();
#endif
-#if CH_DBG_TRACE_MASK != CH_DBG_TRACE_MASK_DISABLED
- _dbg_trace_init();
-#endif
#if CH_CFG_NO_IDLE_THREAD == FALSE
/* Now this instructions flow becomes the main thread.*/
@@ -199,7 +197,7 @@ void chSysHalt(const char *reason) { CH_CFG_SYSTEM_HALT_HOOK(reason);
/* Logging the event.*/
- _dbg_trace_halt(reason);
+ _trace_halt(reason);
/* Pointing to the passed message.*/
ch.dbg.panic_msg = reason;
diff --git a/os/rt/src/chtrace.c b/os/rt/src/chtrace.c index e6f13c6e7..f6c6d8e70 100644 --- a/os/rt/src/chtrace.c +++ b/os/rt/src/chtrace.c @@ -82,10 +82,10 @@ static NOINLINE void trace_next(void) { * @brief Trace circular buffer subsystem initialization.
* @note Internal use only.
*/
-void _dbg_trace_init(void) {
+void _trace_init(void) {
unsigned i;
- ch.dbg.trace_buffer.suspended = CH_DBG_TRACE_MASK;
+ ch.dbg.trace_buffer.suspended = (uint16_t)CH_DBG_TRACE_MASK;
ch.dbg.trace_buffer.size = CH_DBG_TRACE_BUFFER_SIZE;
ch.dbg.trace_buffer.ptr = &ch.dbg.trace_buffer.buffer[0];
for (i = 0U; i < (unsigned)CH_DBG_TRACE_BUFFER_SIZE; i++) {
@@ -96,11 +96,14 @@ void _dbg_trace_init(void) { /**
* @brief Inserts in the circular debug trace buffer a context switch record.
*
+ * @param[in] ntp the thread being switched in
* @param[in] otp the thread being switched out
*
* @notapi
*/
-void _dbg_trace_switch(thread_t *otp) {
+void _trace_switch(thread_t *ntp, thread_t *otp) {
+
+ (void)ntp;
if ((ch.dbg.trace_buffer.suspended & CH_DBG_TRACE_MASK_SWITCH) == 0U) {
ch.dbg.trace_buffer.ptr->type = CH_TRACE_TYPE_SWITCH;
@@ -118,7 +121,7 @@ void _dbg_trace_switch(thread_t *otp) { *
* @notapi
*/
-void _dbg_trace_isr_enter(const char *isr) {
+void _trace_isr_enter(const char *isr) {
if ((ch.dbg.trace_buffer.suspended & CH_DBG_TRACE_MASK_ISR) == 0U) {
port_lock_from_isr();
@@ -137,7 +140,7 @@ void _dbg_trace_isr_enter(const char *isr) { *
* @notapi
*/
-void _dbg_trace_isr_leave(const char *isr) {
+void _trace_isr_leave(const char *isr) {
if ((ch.dbg.trace_buffer.suspended & CH_DBG_TRACE_MASK_ISR) == 0U) {
port_lock_from_isr();
@@ -156,7 +159,7 @@ void _dbg_trace_isr_leave(const char *isr) { *
* @notapi
*/
-void _dbg_trace_halt(const char *reason) {
+void _trace_halt(const char *reason) {
if ((ch.dbg.trace_buffer.suspended & CH_DBG_TRACE_MASK_HALT) == 0U) {
ch.dbg.trace_buffer.ptr->type = CH_TRACE_TYPE_HALT;
|