summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2018-03-08 16:56:14 -0600
committerJoel Sherrill <joel@rtems.org>2018-03-12 14:29:39 -0500
commit924cecd9faa70cc2426a90139a9901a5c25db06a (patch)
tree13fc9a6bb2f44a349eed468fdfea9f01048db169
parentmoxie/include/rtems/score/types.h: Eliminate this file (diff)
downloadrtems-924cecd9faa70cc2426a90139a9901a5c25db06a.tar.bz2
m32c/include/rtems/score/types.h: Eliminate this file
Updates #3327.
-rw-r--r--cpukit/score/cpu/m32c/headers.am1
-rw-r--r--cpukit/score/cpu/m32c/include/rtems/score/cpu.h5
-rw-r--r--cpukit/score/cpu/m32c/include/rtems/score/types.h49
3 files changed, 4 insertions, 51 deletions
diff --git a/cpukit/score/cpu/m32c/headers.am b/cpukit/score/cpu/m32c/headers.am
index f67d070b88..3b2a7a759f 100644
--- a/cpukit/score/cpu/m32c/headers.am
+++ b/cpukit/score/cpu/m32c/headers.am
@@ -14,4 +14,3 @@ include_rtems_score_HEADERS += include/rtems/score/cpu_asm.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/m32c.h
-include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/m32c/include/rtems/score/cpu.h b/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
index af1c3412ea..ec0e71c286 100644
--- a/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m32c/include/rtems/score/cpu.h
@@ -37,7 +37,7 @@
extern "C" {
#endif
-#include <rtems/score/types.h>
+#include <rtems/score/basedefs.h>
#include <rtems/score/m32c.h>
/* conditional compilation parameters */
@@ -978,6 +978,9 @@ static inline CPU_Counter_ticks _CPU_Counter_difference(
return second - first;
}
+/** Type that can store a 32-bit integer or a pointer. */
+typedef unsigned long CPU_Uint32ptr;
+
#ifdef __cplusplus
}
#endif
diff --git a/cpukit/score/cpu/m32c/include/rtems/score/types.h b/cpukit/score/cpu/m32c/include/rtems/score/types.h
deleted file mode 100644
index 99d8297143..0000000000
--- a/cpukit/score/cpu/m32c/include/rtems/score/types.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @file
- *
- * @brief M32C CPU Type Definitions
- *
- * This include file contains type definitions pertaining to the Intel
- * m32c processor family.
- */
-
-/*
- * COPYRIGHT (c) 1989-2006.
- * 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 unsigned long CPU_Uint32ptr;
-
-/** This defines the return type for an ISR entry point. */
-typedef void m32c_isr;
-
-/** This defines the prototype for an ISR entry point. */
-typedef m32c_isr ( *m32c_isr_entry )( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif