diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-03-08 17:27:37 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:41 -0500 |
| commit | 55e76c270fa86ad25a34b5acbfc17de69722542c (patch) | |
| tree | f49e0d73b36432fb71eba9800de512fdb57821cc /cpukit/score/cpu/sparc64 | |
| parent | powerpc/include/rtems/score/types.h: Eliminate this file (diff) | |
| download | rtems-55e76c270fa86ad25a34b5acbfc17de69722542c.tar.bz2 | |
sparc64/include/rtems/score/types.h: Eliminate this file
Updates #3327.
Diffstat (limited to 'cpukit/score/cpu/sparc64')
| -rw-r--r-- | cpukit/score/cpu/sparc64/headers.am | 1 | ||||
| -rw-r--r-- | cpukit/score/cpu/sparc64/include/rtems/score/cpu.h | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/sparc64/include/rtems/score/types.h | 45 |
3 files changed, 4 insertions, 47 deletions
diff --git a/cpukit/score/cpu/sparc64/headers.am b/cpukit/score/cpu/sparc64/headers.am index 9b54d09ece..9ec614509b 100644 --- a/cpukit/score/cpu/sparc64/headers.am +++ b/cpukit/score/cpu/sparc64/headers.am @@ -10,4 +10,3 @@ include_rtems_score_HEADERS += include/rtems/score/cpu.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/sparc64.h -include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h index 47041e7d5e..9db7cc3134 100644 --- a/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/sparc64/include/rtems/score/cpu.h @@ -28,7 +28,7 @@ extern "C" { #endif -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/sparc64.h> /* conditional compilation parameters */ @@ -1042,6 +1042,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/sparc64/include/rtems/score/types.h b/cpukit/score/cpu/sparc64/include/rtems/score/types.h deleted file mode 100644 index faf50b7a55..0000000000 --- a/cpukit/score/cpu/sparc64/include/rtems/score/types.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * @file - * - * @brief SPARC64 CPU Type Definitions - * - * This include file contains type definitions pertaining to the - * SPARC-v9 processor family. - */ - -/* - * COPYRIGHT (c) 1989-1999. 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; - -typedef void sparc_isr; -typedef void ( *sparc_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif |