Updates #3327.
---
cpukit/score/cpu/or1k/headers.am | 1 -
cpukit/score/cpu/or1k/include/rtems/score/cpu.h | 5 ++-
cpukit/score/cpu/or1k/include/rtems/score/types.h | 53 -----------------------
3 files changed, 4 insertions(+), 55 deletions(-)
delete mode 100644 cpukit/score/cpu/or1k/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/or1k/headers.am b/cpukit/score/cpu/or1k/headers.am
index 1ddc654..172e23c 100644
--- a/cpukit/score/cpu/or1k/headers.am
+++ b/cpukit/score/cpu/or1k/headers.am
@@ -12,4 +12,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/or1k-utility.h
include_rtems_score_HEADERS += include/rtems/score/or1k.h
-include_rtems_score_HEADERS += include/rtems/score/types.h
diff --git a/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
index 6daca10f..648a7a6 100644
--- a/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/or1k/include/rtems/score/cpu.h
@@ -30,7 +30,7 @@ extern "C" {
#include <rtems/score/or1k.h> /* pick up machine definitions */
#include <rtems/score/or1k-utility.h>
-#include <rtems/score/types.h>
+#include <rtems/score/basedefs.h>
#ifndef ASM
#include <rtems/bspIo.h>
#include <stdint.h>
@@ -863,6 +863,9 @@ CPU_Counter_ticks _CPU_Counter_difference(
CPU_Counter_ticks 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/or1k/include/rtems/score/types.h
b/cpukit/score/cpu/or1k/include/rtems/score/types.h
deleted file mode 100644
index 09790fe..0000000
--- a/cpukit/score/cpu/or1k/include/rtems/score/types.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file
- *
- * @brief OR1K Architecture Types API
- */
-
-/*
- * This include file contains type definitions pertaining to the
- * arm processor family.
- *
- * COPYRIGHT (c) 2014 Hesham ALMatary <heshamelmat...@gmail.com>
- *
- * 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
-
-/**
- * @addtogroup ScoreCPU
- */
-/**@{**/
-
-/*
- * 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 or1k_isr;
-typedef void ( *or1k_isr_entry )( void );
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif
--
1.8.3.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
