From d978d1b47346ab90b43a3d879cd283705082d09a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 8 Mar 2018 17:25:54 -0600 Subject: powerpc/include/rtems/score/types.h: Eliminate this file Updates #3327. --- cpukit/score/cpu/powerpc/headers.am | 1 - cpukit/score/cpu/powerpc/include/rtems/score/cpu.h | 5 +- .../cpu/powerpc/include/rtems/score/powerpc.h | 2 +- .../score/cpu/powerpc/include/rtems/score/types.h | 60 ---------------------- 4 files changed, 5 insertions(+), 63 deletions(-) delete mode 100644 cpukit/score/cpu/powerpc/include/rtems/score/types.h diff --git a/cpukit/score/cpu/powerpc/headers.am b/cpukit/score/cpu/powerpc/headers.am index d8253e84f9..5d8037c566 100644 --- a/cpukit/score/cpu/powerpc/headers.am +++ b/cpukit/score/cpu/powerpc/headers.am @@ -18,4 +18,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/powerpc.h -include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h b/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h index 8c0f200641..7b6948a1d2 100644 --- a/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/powerpc/include/rtems/score/cpu.h @@ -35,7 +35,7 @@ #ifndef _RTEMS_SCORE_CPU_H #define _RTEMS_SCORE_CPU_H -#include +#include #include #include @@ -1248,6 +1248,9 @@ void _CPU_Fatal_error( uint32_t _error ); +/** 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/powerpc/include/rtems/score/powerpc.h b/cpukit/score/cpu/powerpc/include/rtems/score/powerpc.h index 2cd82ea9f0..84e164d70b 100644 --- a/cpukit/score/cpu/powerpc/include/rtems/score/powerpc.h +++ b/cpukit/score/cpu/powerpc/include/rtems/score/powerpc.h @@ -49,7 +49,7 @@ extern "C" { #endif -#include +#include /* * Define the name of the CPU family. diff --git a/cpukit/score/cpu/powerpc/include/rtems/score/types.h b/cpukit/score/cpu/powerpc/include/rtems/score/types.h deleted file mode 100644 index 38f7a9d968..0000000000 --- a/cpukit/score/cpu/powerpc/include/rtems/score/types.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @file - * - * @brief PowerPC CPU Type Definitions - * - * This include file contains type definitions pertaining to the PowerPC - * processor family. - */ - -/* - * Author: Andrew Bray - * - * COPYRIGHT (c) 1995 by i-cubed ltd. - * - * To anyone who acknowledges that this file is provided "AS IS" - * without any express or implied warranty: - * permission to use, copy, modify, and distribute this file - * for any purpose is hereby granted without fee, provided that - * the above copyright notice and this notice appears in all - * copies, and that the name of i-cubed limited not be used in - * advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * i-cubed limited makes no representations about the suitability - * of this software for any purpose. - * - * Derived from c/src/exec/cpu/no_cpu/no_cputypes.h: - * - * COPYRIGHT (c) 1989-1997. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may 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 uintptr_t CPU_Uint32ptr; - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -- cgit v1.2.3