diff options
author | Joel Sherrill <joel@rtems.org> | 2018-03-08 17:11:03 -0600 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:40 -0500 |
commit | 43bd6b15e83f23ca9793e471406566dbfe334542 (patch) | |
tree | 1fc94a7b8d6d9418565d349d005f1571d10e1700 | |
parent | no_cpu/include/rtems/score/types.h: Eliminate this file (diff) | |
download | rtems-43bd6b15e83f23ca9793e471406566dbfe334542.tar.bz2 |
v850/include/rtems/score/types.h: Eliminate this file
Updates #3327.
-rw-r--r-- | cpukit/score/cpu/v850/headers.am | 1 | ||||
-rw-r--r-- | cpukit/score/cpu/v850/include/rtems/score/cpu.h | 5 | ||||
-rw-r--r-- | cpukit/score/cpu/v850/include/rtems/score/types.h | 43 |
3 files changed, 4 insertions, 45 deletions
diff --git a/cpukit/score/cpu/v850/headers.am b/cpukit/score/cpu/v850/headers.am index ea94e64aa2..47ca503dba 100644 --- a/cpukit/score/cpu/v850/headers.am +++ b/cpukit/score/cpu/v850/headers.am @@ -14,5 +14,4 @@ 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 include_rtems_score_HEADERS += include/rtems/score/v850.h diff --git a/cpukit/score/cpu/v850/include/rtems/score/cpu.h b/cpukit/score/cpu/v850/include/rtems/score/cpu.h index d3cdf0514a..620d228146 100644 --- a/cpukit/score/cpu/v850/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/v850/include/rtems/score/cpu.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/v850.h> /* conditional compilation parameters */ @@ -944,6 +944,9 @@ static inline CPU_Counter_ticks _CPU_Counter_difference( return second - first; } +/** 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/v850/include/rtems/score/types.h b/cpukit/score/cpu/v850/include/rtems/score/types.h deleted file mode 100644 index bfec49d284..0000000000 --- a/cpukit/score/cpu/v850/include/rtems/score/types.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file - * - * @brief V850 CPU Type Definitions - * - * This include file contains type definitions pertaining to the - * v850 processor family. - */ - -/* - * COPYRIGHT (c) 1989-2011. - * 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 _RTEMS_SCORE_TYPES_H -#define _RTEMS_SCORE_TYPES_H - -#include <rtems/score/basedefs.h> - -#ifndef ASM - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * 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 |