[PATCH 09/19] moxie/include/rtems/score/types.h: Eliminate this file

[Joel Sherrill]

Updates #3327.
---
 cpukit/score/cpu/moxie/headers.am                  |  1 -
 cpukit/score/cpu/moxie/include/rtems/score/cpu.h   |  5 +-
 cpukit/score/cpu/moxie/include/rtems/score/types.h | 56 ----------------------
 3 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 cpukit/score/cpu/moxie/include/rtems/score/types.h

diff --git a/cpukit/score/cpu/moxie/headers.am b/cpukit/score/cpu/moxie/headers.am
index 4f253a6..9097db9 100644
--- a/cpukit/score/cpu/moxie/headers.am
+++ b/cpukit/score/cpu/moxie/headers.am
@@ -14,4 +14,3 @@ include_rtems_score_HEADERS += include/rtems/score/cpu.h
 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/moxie.h
-include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/moxie/include/rtems/score/cpu.h b/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
index a3aac9e..7ab3e37 100644
--- a/cpukit/score/cpu/moxie/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/moxie/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/moxie.h>  /* pick up machine definitions */
 
 #include <rtems/bspIo.h>        /* printk */
@@ -845,6 +845,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;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpukit/score/cpu/moxie/include/rtems/score/types.h b/cpukit/score/cpu/moxie/include/rtems/score/types.h
deleted file mode 100644
index 99402b0..0000000
--- a/cpukit/score/cpu/moxie/include/rtems/score/types.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @file rtems/score/types.h
- */
-
-/*
- *  This file contains information pertaining to the Moxie processor.
- *
- *  COPYRIGHT (c) 2011
- *  Anthony Green
- *
- *  Based on code with the following copyright...
- *  COPYRIGHT (c) 1989-1999, 2010.
- *  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
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#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 moxie_isr;
-typedef void ( *moxie_isr_entry )( void );
-
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool    boolean;                /* Boolean value   */
-typedef float   single_precision;       /* single precision float */
-typedef double  double_precision;       /* double precision float */
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* !ASM */
-
-#endif
-- 
1.8.3.1