diff options
author | Joel Sherrill <joel@rtems.org> | 2018-03-08 13:09:17 -0600 |
---|---|---|
committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:37 -0500 |
commit | a1df2fdcc8e824d766351a345fa87d1361307058 (patch) | |
tree | 331aa2dc1d1db8bf8d25bc123d919d3653e8f683 /cpukit/score/cpu/i386 | |
parent | mips/include/rtems/score/types.h: Eliminate this file (diff) | |
download | rtems-a1df2fdcc8e824d766351a345fa87d1361307058.tar.bz2 |
i386/include/rtems/score/types.h: Eliminate this file
Updates #3327.
Diffstat (limited to 'cpukit/score/cpu/i386')
-rw-r--r-- | cpukit/score/cpu/i386/cpu.c | 1 | ||||
-rw-r--r-- | cpukit/score/cpu/i386/headers.am | 1 | ||||
-rw-r--r-- | cpukit/score/cpu/i386/include/rtems/score/cpu.h | 5 | ||||
-rw-r--r-- | cpukit/score/cpu/i386/include/rtems/score/types.h | 46 |
4 files changed, 4 insertions, 49 deletions
diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c index c9434f7c86..b591b76508 100644 --- a/cpukit/score/cpu/i386/cpu.c +++ b/cpukit/score/cpu/i386/cpu.c @@ -21,7 +21,6 @@ #include <rtems.h> #include <rtems/system.h> -#include <rtems/score/types.h> #include <rtems/score/isr.h> #include <rtems/score/idtr.h> #include <rtems/score/tls.h> diff --git a/cpukit/score/cpu/i386/headers.am b/cpukit/score/cpu/i386/headers.am index ea07edcbd4..ab47f9a803 100644 --- a/cpukit/score/cpu/i386/headers.am +++ b/cpukit/score/cpu/i386/headers.am @@ -17,4 +17,3 @@ include_rtems_score_HEADERS += include/rtems/score/i386.h include_rtems_score_HEADERS += include/rtems/score/idtr.h include_rtems_score_HEADERS += include/rtems/score/interrupts.h include_rtems_score_HEADERS += include/rtems/score/registers.h -include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/score/cpu/i386/include/rtems/score/cpu.h b/cpukit/score/cpu/i386/include/rtems/score/cpu.h index f78149c24b..058d254f8b 100644 --- a/cpukit/score/cpu/i386/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/i386/include/rtems/score/cpu.h @@ -27,7 +27,7 @@ extern "C" { #endif -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/i386.h> /* conditional compilation parameters */ @@ -691,6 +691,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/i386/include/rtems/score/types.h b/cpukit/score/cpu/i386/include/rtems/score/types.h deleted file mode 100644 index 00555d41b5..0000000000 --- a/cpukit/score/cpu/i386/include/rtems/score/types.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file - * - * @brief Intel I386 CPU Type Definitions - * - * This include file contains type definitions pertaining to the Intel - * i386 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 i386_isr; -typedef i386_isr ( *i386_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif |