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

[Joel Sherrill]

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

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

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

Updates #3327.

---

 cpukit/score/cpu/nios2/headers.am                  |  1 -
 cpukit/score/cpu/nios2/include/rtems/score/cpu.h   |  5 ++-
 cpukit/score/cpu/nios2/include/rtems/score/types.h | 46 ----------------------
 3 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/cpukit/score/cpu/nios2/headers.am b/cpukit/score/cpu/nios2/headers.am
index 8cf15f1..b5ca789 100644
--- a/cpukit/score/cpu/nios2/headers.am
+++ b/cpukit/score/cpu/nios2/headers.am
@@ -17,4 +17,3 @@ include_rtems_score_HEADERS += include/rtems/score/cpuimpl.h
 include_rtems_score_HEADERS += include/rtems/score/nios2-count-zeros.h
 include_rtems_score_HEADERS += include/rtems/score/nios2-utility.h
 include_rtems_score_HEADERS += include/rtems/score/nios2.h
-include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
index a3f2f03..c7fdb92 100644
--- a/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/nios2/include/rtems/score/cpu.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-#include <rtems/score/types.h>
+#include <rtems/score/basedefs.h>
 #include <rtems/score/nios2.h>
 
 #define CPU_HAS_SOFTWARE_INTERRUPT_STACK TRUE
@@ -363,6 +363,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;
+
 #endif /* ASM */
 
 #ifdef __cplusplus
diff --git a/cpukit/score/cpu/nios2/include/rtems/score/types.h b/cpukit/score/cpu/nios2/include/rtems/score/types.h
deleted file mode 100644
index 23cf394..0000000
--- a/cpukit/score/cpu/nios2/include/rtems/score/types.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @file
- *
- * @brief Altera Nios II CPU Type Definitions
- *
- * This include file contains type definitions pertaining to the
- * Altera Nios II processor family.
- */
-
-/*
- *  COPYRIGHT (c) 1989-1999.
- *  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 nios2_isr;
-typedef void ( *nios2_isr_entry )( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* !ASM */
-
-#endif