From 924cecd9faa70cc2426a90139a9901a5c25db06a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 8 Mar 2018 16:56:14 -0600 Subject: m32c/include/rtems/score/types.h: Eliminate this file Updates #3327. --- cpukit/score/cpu/m32c/headers.am | 1 - cpukit/score/cpu/m32c/include/rtems/score/cpu.h | 5 ++- cpukit/score/cpu/m32c/include/rtems/score/types.h | 49 ----------------------- 3 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 cpukit/score/cpu/m32c/include/rtems/score/types.h 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 +#include #include /* 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 - -#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 -- cgit v1.2.3