summaryrefslogtreecommitdiff
path: root/common/src/tx_thread_stack_error_notify.c
diff options
context:
space:
mode:
Diffstat (limited to 'common/src/tx_thread_stack_error_notify.c')
-rw-r--r--common/src/tx_thread_stack_error_notify.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/common/src/tx_thread_stack_error_notify.c b/common/src/tx_thread_stack_error_notify.c
index 6142bad3..5f481c16 100644
--- a/common/src/tx_thread_stack_error_notify.c
+++ b/common/src/tx_thread_stack_error_notify.c
@@ -26,9 +26,8 @@
/* Include necessary system files. */
#include "tx_api.h"
-#ifndef TX_PORT_THREAD_STACK_ERROR_NOTIFY
#include "tx_thread.h"
-#ifdef TX_ENABLE_STACK_CHECKING
+#if defined(TX_ENABLE_STACK_CHECKING) || defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
#include "tx_trace.h"
#endif
@@ -38,7 +37,7 @@
/* FUNCTION RELEASE */
/* */
/* _tx_thread_stack_error_notify PORTABLE C */
-/* 6.1.7 */
+/* 6.1.9 */
/* AUTHOR */
/* */
/* William E. Lamie, Microsoft Corporation */
@@ -79,12 +78,15 @@
/* conditional compilation */
/* for ARMv8-M (Cortex M23/33) */
/* resulting in version 6.1.7 */
+/* 10-15-2021 Yuxin Zhou Modified comment(s), improved */
+/* stack check error handling, */
+/* resulting in version 6.1.9 */
/* */
/**************************************************************************/
UINT _tx_thread_stack_error_notify(VOID (*stack_error_handler)(TX_THREAD *thread_ptr))
{
-#ifndef TX_ENABLE_STACK_CHECKING
+#if !defined(TX_ENABLE_STACK_CHECKING) && !defined(TX_PORT_THREAD_STACK_ERROR_HANDLING)
UINT status;
@@ -98,13 +100,14 @@ UINT status;
}
else
{
-
+
/* Stack checking is not enabled, just return an error. */
status = TX_FEATURE_NOT_ENABLED;
}
/* Return completion status. */
return(status);
+
#else
TX_INTERRUPT_SAVE_AREA
@@ -129,5 +132,3 @@ TX_INTERRUPT_SAVE_AREA
return(TX_SUCCESS);
#endif
}
-
-#endif /* TX_PORT_THREAD_STACK_ERROR_NOTIFY */