diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-03-08 12:28:54 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:37 -0500 |
| commit | cbbe68ba0efb03822d7a8ad3f4728e6093566065 (patch) | |
| tree | 263914c0192a641e2ce4c2caa73854db520ad923 | |
| parent | shell: Fix rtems_shell_init_env() (diff) | |
| download | rtems-cbbe68ba0efb03822d7a8ad3f4728e6093566065.tar.bz2 | |
bfin/include/rtems/score/types.h: Eliminate this file
Updates #3327.
| -rw-r--r-- | cpukit/score/cpu/bfin/headers.am | 1 | ||||
| -rw-r--r-- | cpukit/score/cpu/bfin/include/rtems/score/cpu.h | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/bfin/include/rtems/score/types.h | 49 |
3 files changed, 4 insertions, 51 deletions
diff --git a/cpukit/score/cpu/bfin/headers.am b/cpukit/score/cpu/bfin/headers.am index b9eba7b181..d6ff410d50 100644 --- a/cpukit/score/cpu/bfin/headers.am +++ b/cpukit/score/cpu/bfin/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/bfin/include/rtems/score/cpu.h b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h index 7c90fc6575..d2c2cade08 100644 --- a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h @@ -25,7 +25,7 @@ extern "C" { #endif -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/bfin.h> /* conditional compilation parameters */ @@ -992,6 +992,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; + #endif /* ASM */ #ifdef __cplusplus diff --git a/cpukit/score/cpu/bfin/include/rtems/score/types.h b/cpukit/score/cpu/bfin/include/rtems/score/types.h deleted file mode 100644 index 9865357cdd..0000000000 --- a/cpukit/score/cpu/bfin/include/rtems/score/types.h +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @file - * - * @brief Blackfin CPU Type Definitions - * - * This include file contains type definitions pertaining to the - * Blackfin processor family. - */ - -/* - * 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 _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; - -/** This defines the return type for an ISR entry point. */ -typedef void blackfin_isr; - -/** This defines the prototype for an ISR entry point. */ -typedef blackfin_isr ( *blackfin_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif |