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

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

Browse Source 
Updates #3327.
This commit is contained in:
Joel Sherrill
2018-03-08 17:28:31 -06:00
parent 55e76c270f
commit c2282d6dca
4 changed files with 5 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,4 +19,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/sparc.h include_rtems_score_HEADERS += include/rtems/score/sparc.h
include_rtems_score_HEADERS += include/rtems/score/sparcimpl.h include_rtems_score_HEADERS += include/rtems/score/sparcimpl.h
include_rtems_score_HEADERS += include/rtems/score/types.h

5
cpukit/score/cpu/sparc/include/rtems/score/cpu.h
View File

@@ -23,7 +23,7 @@
extern "C" { extern "C" {
#endif #endif
#include <rtems/score/types.h> #include <rtems/score/basedefs.h>
#include <rtems/score/sparc.h> #include <rtems/score/sparc.h>
/* conditional compilation parameters */ /* conditional compilation parameters */
@@ -1193,6 +1193,9 @@ static inline CPU_Counter_ticks _CPU_Counter_difference(
return ( *_SPARC_Counter.counter_difference )( second, first ); return ( *_SPARC_Counter.counter_difference )( second, first );
} }
/** Type that can store a 32-bit integer or a pointer. */
typedef uintptr_t CPU_Uint32ptr;
#endif /* ASM */ #endif /* ASM */
#ifdef __cplusplus #ifdef __cplusplus

2
cpukit/score/cpu/sparc/include/rtems/score/sparc.h
View File

@@ -23,7 +23,7 @@
#ifndef _RTEMS_SCORE_SPARC_H #ifndef _RTEMS_SCORE_SPARC_H
#define _RTEMS_SCORE_SPARC_H #define _RTEMS_SCORE_SPARC_H
#include <rtems/score/types.h> #include <rtems/score/basedefs.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

53
cpukit/score/cpu/sparc/include/rtems/score/types.h
View File

@@ -1,53 +0,0 @@
/**
* @file
*
* @brief SPARC CPU Type Definitions
*
* This include file contains type definitions pertaining to the
* SPARC processor family.
*/
/*
* COPYRIGHT (c) 1989-2011.
* 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
/** Type that can store a 32-bit integer or a pointer. */
typedef uintptr_t CPU_Uint32ptr;
/**
* @brief SPARC ISR handler return type.
*
* This is the type which SPARC ISR Handlers return.
*/
typedef void sparc_isr;
/**
* @brief SPARC ISR handler prototype.
*
* This is the prototype for SPARC ISR Handlers.
*/
typedef void ( *sparc_isr_entry )( void );
#ifdef __cplusplus
}
#endif
#endif /* !ASM */
#endif