diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-03-08 14:15:47 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:38 -0500 |
| commit | fce900b543534a573311fc1263deb33b588a050c (patch) | |
| tree | f79d772d041d60a4e10b0c3bd503cdcb208737a5 /cpukit/score/cpu/sh/include/rtems/score | |
| parent | misc sh: Remove includes of rtems/score/types.h (diff) | |
| download | rtems-fce900b543534a573311fc1263deb33b588a050c.tar.bz2 | |
sh/include/rtems/score/types.h: Eliminate this file
Updates #3327.
Diffstat (limited to 'cpukit/score/cpu/sh/include/rtems/score')
| -rw-r--r-- | cpukit/score/cpu/sh/include/rtems/score/cpu.h | 9 | ||||
| -rw-r--r-- | cpukit/score/cpu/sh/include/rtems/score/types.h | 56 |
2 files changed, 8 insertions, 57 deletions
diff --git a/cpukit/score/cpu/sh/include/rtems/score/cpu.h b/cpukit/score/cpu/sh/include/rtems/score/cpu.h index c2b7081e9e..aeef5defdd 100644 --- a/cpukit/score/cpu/sh/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/sh/include/rtems/score/cpu.h @@ -31,7 +31,7 @@ extern "C" { #endif -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/sh.h> /* conditional compilation parameters */ @@ -731,6 +731,13 @@ 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; + +/** Types related to SH specific ISRs */ +typedef void sh_isr; +typedef void ( *sh_isr_entry )( void ); + #ifdef __cplusplus } #endif diff --git a/cpukit/score/cpu/sh/include/rtems/score/types.h b/cpukit/score/cpu/sh/include/rtems/score/types.h deleted file mode 100644 index a449a6d6e3..0000000000 --- a/cpukit/score/cpu/sh/include/rtems/score/types.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - * @file - * - * @brief Hitachi SH CPU Type Definitions - * - * This include file contains information pertaining to the Hitachi SH - * processor. - */ - -/* - * Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and - * Bernd Becker (becker@faw.uni-ulm.de) - * - * COPYRIGHT (c) 1997-1998, FAW Ulm, Germany - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * - * COPYRIGHT (c) 1998-2001. - * 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 sh_isr; -typedef void ( *sh_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif |