diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-03-08 13:18:43 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:38 -0500 |
| commit | c98d4748b79f6aa0c81715dc7d26af5a2b5c3c4d (patch) | |
| tree | 112dc7aada81c5096d0b5299104e0784d3937e4e /cpukit/score/cpu/lm32 | |
| parent | i386/include/rtems/score/types.h: Eliminate this file (diff) | |
| download | rtems-c98d4748b79f6aa0c81715dc7d26af5a2b5c3c4d.tar.bz2 | |
lm32/include/rtems/score/types.h: Eliminate this file
Updates #3327.
Diffstat (limited to 'cpukit/score/cpu/lm32')
| -rw-r--r-- | cpukit/score/cpu/lm32/headers.am | 1 | ||||
| -rw-r--r-- | cpukit/score/cpu/lm32/include/rtems/score/cpu.h | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/lm32/include/rtems/score/types.h | 46 |
3 files changed, 4 insertions, 48 deletions
diff --git a/cpukit/score/cpu/lm32/headers.am b/cpukit/score/cpu/lm32/headers.am index 68128ca00b..178f3756d4 100644 --- a/cpukit/score/cpu/lm32/headers.am +++ b/cpukit/score/cpu/lm32/headers.am @@ -15,4 +15,3 @@ 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/lm32.h -include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/score/cpu/lm32/include/rtems/score/cpu.h b/cpukit/score/cpu/lm32/include/rtems/score/cpu.h index 9d229948aa..f36e00e404 100644 --- a/cpukit/score/cpu/lm32/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/lm32/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/lm32.h> /* conditional compilation parameters */ @@ -1028,6 +1028,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/lm32/include/rtems/score/types.h b/cpukit/score/cpu/lm32/include/rtems/score/types.h deleted file mode 100644 index c3d8666de4..0000000000 --- a/cpukit/score/cpu/lm32/include/rtems/score/types.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file - * - * @brief LM32 CPU Type Definitions - * - * This include file contains type definitions pertaining to the - * Lattice lm32 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. - * - * Jukka Pietarinen <jukka.pietarinen@mrf.fi>, 2008, - * Micro-Research Finland Oy - */ - -#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 |