Updates #3327.
---
cpukit/score/cpu/bfin/headers.am | 1 -
cpukit/score/cpu/bfin/include/rtems/score/cpu.h | 5 ++-
cpukit/score/cpu/bfin/include/rtems/score/types.h | 49 -----------------------
3 files changed, 4 insertions(+), 51 deletions(-)
delete mode 100644 cpukit/score/cpu/bfin/include/rtems/score/types.h
diff --git a/cpukit/score/cpu/bfin/headers.am b/cpukit/score/cpu/bfin/headers.am
index b9eba7b..d6ff410 100644
--- a/cpukit/score/cpu/bfin/headers.am
+++ b/cpukit/score/cpu/bfin/headers.am
@@ -21,4 +21,3 @@ include_rtems_score_HEADERS += include/rtems/score/cpu.h
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/types.h
diff --git a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
index 7c90fc6..d2c2cad 100644
--- a/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
+++ b/cpukit/score/cpu/bfin/include/rtems/score/cpu.h
@@ -25,7 +25,7 @@
extern "C" {
#endif
-#include <rtems/score/types.h>
+#include <rtems/score/basedefs.h>
#include <rtems/score/bfin.h>
/* conditional compilation parameters */
@@ -992,6 +992,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/bfin/include/rtems/score/types.h
b/cpukit/score/cpu/bfin/include/rtems/score/types.h
deleted file mode 100644
index 9865357..0000000
--- a/cpukit/score/cpu/bfin/include/rtems/score/types.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @file
- *
- * @brief Blackfin CPU Type Definitions
- *
- * This include file contains type definitions pertaining to the
- * Blackfin 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 uintptr_t CPU_Uint32ptr;
-
-/** This defines the return type for an ISR entry point. */
-typedef void blackfin_isr;
-
-/** This defines the prototype for an ISR entry point. */
-typedef blackfin_isr ( *blackfin_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
