Updates #3327. --- cpukit/score/cpu/arm/headers.am | 1 - cpukit/score/cpu/arm/include/rtems/score/cpu.h | 5 ++- cpukit/score/cpu/arm/include/rtems/score/types.h | 51 ------------------------ 3 files changed, 4 insertions(+), 53 deletions(-) delete mode 100644 cpukit/score/cpu/arm/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/arm/headers.am b/cpukit/score/cpu/arm/headers.am index 61a055f..6325328 100644 --- a/cpukit/score/cpu/arm/headers.am +++ b/cpukit/score/cpu/arm/headers.am @@ -21,4 +21,3 @@ include_rtems_score_HEADERS += include/rtems/score/cpu.h include_rtems_score_HEADERS += include/rtems/score/cpu_asm.h include_rtems_score_HEADERS += include/rtems/score/cpuatomic.h include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h -include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/score/cpu/arm/include/rtems/score/cpu.h b/cpukit/score/cpu/arm/include/rtems/score/cpu.h index 05e236c..15e3ac7 100644 --- a/cpukit/score/cpu/arm/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/arm/include/rtems/score/cpu.h @@ -29,7 +29,7 @@ #ifndef _RTEMS_SCORE_CPU_H #define _RTEMS_SCORE_CPU_H -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/arm.h> #if defined(ARM_MULTILIB_ARCH_V4) @@ -693,6 +693,9 @@ void _ARM_Exception_default( CPU_Exception_frame *frame ); /** @} */ +/** Type that can store a 32-bit integer or a pointer. */ +typedef uintptr_t CPU_Uint32ptr; + #ifdef __cplusplus } #endif diff --git a/cpukit/score/cpu/arm/include/rtems/score/types.h b/cpukit/score/cpu/arm/include/rtems/score/types.h deleted file mode 100644 index 37a56df..0000000 --- a/cpukit/score/cpu/arm/include/rtems/score/types.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @file - * - * @brief ARM Architecture Types API - */ - -/* - * This include file contains type definitions pertaining to the - * arm processor family. - * - * COPYRIGHT (c) 2000 Canon Research Centre France SA. - * Emmanuel Raguet, mailto:rag...@crf.canon.fr - * - * 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 _RTEMS_SCORE_TYPES_H -#define _RTEMS_SCORE_TYPES_H - -#include <rtems/score/basedefs.h> - -#ifndef ASM - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @addtogroup ScoreCPU - */ -/**@{**/ - -/* - * This section defines the basic types for this processor. - */ - -/** Type that can store a 32-bit integer or a pointer. */ -typedef uintptr_t CPU_Uint32ptr; - -/** @} */ - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -- 1.8.3.1 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
