RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

sh/include/rtems/score/types.h: Eliminate this file

Browse Source 
Updates #3327.
This commit is contained in:
Joel Sherrill
2018-03-08 14:15:47 -06:00
parent 070658100a
commit fce900b543
3 changed files with 8 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cpukit/score/cpu/sh/headers.am
View File

@@ -11,4 +11,3 @@ 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/cpuimpl.h
include_rtems_score_HEADERS += include/rtems/score/sh.h include_rtems_score_HEADERS += include/rtems/score/sh.h
include_rtems_score_HEADERS += include/rtems/score/sh_io.h include_rtems_score_HEADERS += include/rtems/score/sh_io.h
include_rtems_score_HEADERS += include/rtems/score/types.h

9
cpukit/score/cpu/sh/include/rtems/score/cpu.h
View File

@@ -31,7 +31,7 @@
extern "C" { extern "C" {
#endif #endif
#include <rtems/score/types.h> #include <rtems/score/basedefs.h>
#include <rtems/score/sh.h> #include <rtems/score/sh.h>
/* conditional compilation parameters */ /* conditional compilation parameters */
@@ -731,6 +731,13 @@ static inline CPU_Counter_ticks _CPU_Counter_difference(
return second - first; 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 #ifdef __cplusplus
} }
#endif #endif

56
cpukit/score/cpu/sh/include/rtems/score/types.h
View File

@@ -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