summaryrefslogtreecommitdiffstats
path: root/cpukit/score/cpu
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2018-03-08 12:29:23 -0600
committerJoel Sherrill <joel@rtems.org>2018-03-12 14:29:37 -0500
commit859251a3ac416ff2c3987fa28d07cdde435508c6 (patch)
tree3a30aeb1b0f00a3fb05b166e7ef0ed015199d06a /cpukit/score/cpu
parentbfin/include/rtems/score/types.h: Eliminate this file (diff)
downloadrtems-859251a3ac416ff2c3987fa28d07cdde435508c6.tar.bz2
mips/include/rtems/score/types.h: Eliminate this file
Updates #3327.
Diffstat (limited to 'cpukit/score/cpu')
-rw-r--r--cpukit/score/cpu/mips/headers.am1
-rw-r--r--cpukit/score/cpu/mips/include/rtems/score/cpu.h7
-rw-r--r--cpukit/score/cpu/mips/include/rtems/score/types.h56
3 files changed, 4 insertions, 60 deletions
diff --git a/cpukit/score/cpu/mips/headers.am b/cpukit/score/cpu/mips/headers.am
index cbcf1dd91f..a1effb7986 100644
--- a/cpukit/score/cpu/mips/headers.am
+++ b/cpukit/score/cpu/mips/headers.am
@@ -19,4 +19,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/mips.h
-include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/mips/include/rtems/score/cpu.h b/cpukit/score/cpu/mips/include/rtems/score/cpu.h
index 74afc800b9..acc4ef81ec 100644
--- a/cpukit/score/cpu/mips/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/mips/include/rtems/score/cpu.h
@@ -56,7 +56,7 @@
extern "C" {
#endif
-#include <rtems/score/types.h>
+#include <rtems/score/basedefs.h>
#include <rtems/score/mips.h>
/* conditional compilation parameters */
@@ -998,9 +998,10 @@ static inline CPU_Counter_ticks _CPU_Counter_difference(
return second - first;
}
-#endif
-
+/** Type that can store a 32-bit integer or a pointer. */
+typedef uintptr_t CPU_Uint32ptr;
+#endif
#ifdef __cplusplus
}
diff --git a/cpukit/score/cpu/mips/include/rtems/score/types.h b/cpukit/score/cpu/mips/include/rtems/score/types.h
deleted file mode 100644
index e3226a3bb4..0000000000
--- a/cpukit/score/cpu/mips/include/rtems/score/types.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @file rtems/score/types.h
- *
- * @brief Type Definitions Pertaining to the MIPS Processor Family
- *
- * This include file contains type definitions pertaining to the MIPS
- * processor family.
- */
-
-/*
- * COPYRIGHT (c) 1989-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.
- */
-/* @(#)mipstypes.h 08/20/96 1.4 */
-
-#ifndef _RTEMS_SCORE_TYPES_H
-#define _RTEMS_SCORE_TYPES_H
-
-/**
- * @defgroup ScoreTypes MIPS Processor Family Type Definitions
- *
- * @ingroup Score
- *
- */
-/**@{*/
-
-#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 mips_isr;
-typedef void ( *mips_isr_entry )( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-/**@}*/
-#endif