diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-03-08 17:10:38 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:39 -0500 |
| commit | e88abc0a1ea17ca95a4c41174380516d599b3aae (patch) | |
| tree | 5135a5fd3bb8db85e7a638e37b0fddb11bc16dba /cpukit/score/cpu/no_cpu | |
| parent | or1k/include/rtems/score/types.h: Eliminate this file (diff) | |
| download | rtems-e88abc0a1ea17ca95a4c41174380516d599b3aae.tar.bz2 | |
no_cpu/include/rtems/score/types.h: Eliminate this file
Updates #3327.
Diffstat (limited to 'cpukit/score/cpu/no_cpu')
| -rw-r--r-- | cpukit/score/cpu/no_cpu/headers.am | 1 | ||||
| -rw-r--r-- | cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h | 6 | ||||
| -rw-r--r-- | cpukit/score/cpu/no_cpu/include/rtems/score/types.h | 43 |
3 files changed, 5 insertions, 45 deletions
diff --git a/cpukit/score/cpu/no_cpu/headers.am b/cpukit/score/cpu/no_cpu/headers.am index faf934fb1e..ee24fb131d 100644 --- a/cpukit/score/cpu/no_cpu/headers.am +++ b/cpukit/score/cpu/no_cpu/headers.am @@ -10,4 +10,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/cpuimpl.h include_rtems_score_HEADERS += include/rtems/score/no_cpu.h -include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h index c16adc7327..5902b4ef36 100644 --- a/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/no_cpu/include/rtems/score/cpu.h @@ -40,7 +40,7 @@ extern "C" { #endif -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/no_cpu.h> /* conditional compilation parameters */ @@ -1492,6 +1492,10 @@ CPU_Counter_ticks _CPU_Counter_difference( { context->is_executing = is_executing; } + +/** Type that can store a 32-bit integer or a pointer. */ +typedef uintptr_t CPU_Uint32ptr; + #endif #ifdef __cplusplus diff --git a/cpukit/score/cpu/no_cpu/include/rtems/score/types.h b/cpukit/score/cpu/no_cpu/include/rtems/score/types.h deleted file mode 100644 index b330c33904..0000000000 --- a/cpukit/score/cpu/no_cpu/include/rtems/score/types.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file - * - * @brief No-CPU Type Definitions - * - * This include file contains type definitions pertaining to the Intel - * no_cpu 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; - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif |