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

[Joel Sherrill]

Module:    rtems
Branch:    master
Commit:    c2282d6dca5104ddcd061a033f632bc09daada8d
Changeset: http://git.rtems.org/rtems/commit/?id=c2282d6dca5104ddcd061a033f632bc09daada8d

Author:    Joel Sherrill <joel at rtems.org>
Date:      Thu Mar  8 17:28:31 2018 -0600

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

Updates #3327.

---

 cpukit/score/cpu/sparc/headers.am                  |  1 -
 cpukit/score/cpu/sparc/include/rtems/score/cpu.h   |  5 +-
 cpukit/score/cpu/sparc/include/rtems/score/sparc.h |  2 +-
 cpukit/score/cpu/sparc/include/rtems/score/types.h | 53 ----------------------
 4 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/cpukit/score/cpu/sparc/headers.am b/cpukit/score/cpu/sparc/headers.am
index 89f4f63..0e1aea9 100644
--- a/cpukit/score/cpu/sparc/headers.am
+++ b/cpukit/score/cpu/sparc/headers.am
@@ -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/sparc.h
 include_rtems_score_HEADERS += include/rtems/score/sparcimpl.h
-include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/sparc/include/rtems/score/cpu.h b/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
index 2b50592..be02dcf 100644
--- a/cpukit/score/cpu/sparc/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/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/sparc.h>
 
 /* conditional compilation parameters */
@@ -1193,6 +1193,9 @@ static inline CPU_Counter_ticks _CPU_Counter_difference(
   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 */
 
 #ifdef __cplusplus
diff --git a/cpukit/score/cpu/sparc/include/rtems/score/sparc.h b/cpukit/score/cpu/sparc/include/rtems/score/sparc.h
index 747d013..47d8e6f 100644
--- a/cpukit/score/cpu/sparc/include/rtems/score/sparc.h
+++ b/cpukit/score/cpu/sparc/include/rtems/score/sparc.h
@@ -23,7 +23,7 @@
 #ifndef _RTEMS_SCORE_SPARC_H
 #define _RTEMS_SCORE_SPARC_H
 
-#include <rtems/score/types.h>
+#include <rtems/score/basedefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpukit/score/cpu/sparc/include/rtems/score/types.h b/cpukit/score/cpu/sparc/include/rtems/score/types.h
deleted file mode 100644
index 6419c9f..0000000
--- a/cpukit/score/cpu/sparc/include/rtems/score/types.h
+++ /dev/null
@@ -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