From bba988d313e53f5ccfba01e3b2a58bc2175300cf Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 7 Sep 2016 13:46:40 +0200 Subject: stackchk: Remove superfluous internal header file --- cpukit/libmisc/Makefile.am | 2 +- cpukit/libmisc/stackchk/check.c | 26 +++++++++- cpukit/libmisc/stackchk/internal.h | 101 ------------------------------------- 3 files changed, 26 insertions(+), 103 deletions(-) delete mode 100644 cpukit/libmisc/stackchk/internal.h diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index 4f5c01dd2b..97e14b0684 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -148,7 +148,7 @@ EXTRA_DIST += serdbg/README ## stackchk noinst_LIBRARIES += libstackchk.a -libstackchk_a_SOURCES = stackchk/check.c stackchk/internal.h \ +libstackchk_a_SOURCES = stackchk/check.c \ stackchk/stackchk.h EXTRA_DIST += stackchk/README diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c index a4b606a0e3..2cf490a27e 100644 --- a/cpukit/libmisc/stackchk/check.c +++ b/cpukit/libmisc/stackchk/check.c @@ -43,7 +43,31 @@ #include #include #include -#include "internal.h" + +/* + * This structure is used to fill in and compare the "end of stack" + * marker pattern. + * pattern area must be a multiple of 4 words. + */ + +#ifdef CPU_STACK_CHECK_SIZE +#define PATTERN_SIZE_WORDS (((CPU_STACK_CHECK_SIZE / 4) + 3) & ~0x3) +#else +#define PATTERN_SIZE_WORDS (4) +#endif + +#define PATTERN_SIZE_BYTES (PATTERN_SIZE_WORDS * sizeof(uint32_t)) + +/* + * The pattern used to fill the entire stack. + */ + +#define BYTE_PATTERN 0xA5 +#define U32_PATTERN 0xA5A5A5A5 + +typedef struct { + uint32_t pattern[ PATTERN_SIZE_WORDS ]; +} Stack_check_Control; /* * Variable to indicate when the stack checker has been initialized. diff --git a/cpukit/libmisc/stackchk/internal.h b/cpukit/libmisc/stackchk/internal.h deleted file mode 100644 index d64adba668..0000000000 --- a/cpukit/libmisc/stackchk/internal.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * @file rtems/internal.h - * - * @defgroup libmisc_internal Internal Stack Checker Information - * - * @ingroup libmisc - * @brief Stack Checker Internal Information - * - * This include file contains internal information - * for the RTEMS stack checker. - */ - -/* - * COPYRIGHT (c) 1989-2006. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef __INTERNAL_STACK_CHECK_h -#define __INTERNAL_STACK_CHECK_h - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This structure is used to fill in and compare the "end of stack" - * marker pattern. - * pattern area must be a multiple of 4 words. - */ - -#ifdef CPU_STACK_CHECK_SIZE -#define PATTERN_SIZE_WORDS (((CPU_STACK_CHECK_SIZE / 4) + 3) & ~0x3) -#else -#define PATTERN_SIZE_WORDS (4) -#endif - -#define PATTERN_SIZE_BYTES (PATTERN_SIZE_WORDS * sizeof(uint32_t)) - -typedef struct { - uint32_t pattern[ PATTERN_SIZE_WORDS ]; -} Stack_check_Control; - -/* - * The pattern used to fill the entire stack. - */ - -#define BYTE_PATTERN 0xA5 -#define U32_PATTERN 0xA5A5A5A5 - -/* - * rtems_stack_checker_create_extension - */ - -bool rtems_stack_checker_create_extension( - Thread_Control *running, - Thread_Control *the_thread -); - -/* - * rtems_stack_checker_begin_extension - */ - -void rtems_stack_checker_begin_extension( - Thread_Control *the_thread -); - -/* - * rtems_stack_checker_switch_extension - */ - -void rtems_stack_checker_switch_extension( - Thread_Control *running, - Thread_Control *heir -); - -/* - * rtems_stack_checker_fatal_extension - */ - -void rtems_stack_checker_fatal_extension( - Internal_errors_Source source, - bool is_internal, - uint32_t status -); - -/* - * rtems_stack_checker_report_usage - */ - -void rtems_stack_checker_report_usage( void ); - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ -- cgit v1.2.3