diff options
| author | Joel Sherrill <joel@rtems.org> | 2018-03-08 17:24:47 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2018-03-12 14:29:40 -0500 |
| commit | 8d96b46fa17bcc977a6fd3d5fd52ed9bca372602 (patch) | |
| tree | e873a5eafdcb7767faa9f7015a5dd73f97cc9913 /cpukit/score/cpu/m68k | |
| parent | riscv/include/rtems/score/types.h: Eliminate this file (diff) | |
| download | rtems-8d96b46fa17bcc977a6fd3d5fd52ed9bca372602.tar.bz2 | |
m68k/include/rtems/score/types.h: Eliminate this file
Updates #3327.
Diffstat (limited to 'cpukit/score/cpu/m68k')
| -rw-r--r-- | cpukit/score/cpu/m68k/headers.am | 1 | ||||
| -rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/score/cpu.h | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/m68k/include/rtems/score/types.h | 43 |
3 files changed, 3 insertions, 45 deletions
diff --git a/cpukit/score/cpu/m68k/headers.am b/cpukit/score/cpu/m68k/headers.am index e02fad3906..ee8c36cadc 100644 --- a/cpukit/score/cpu/m68k/headers.am +++ b/cpukit/score/cpu/m68k/headers.am @@ -21,4 +21,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/m68k.h -include_rtems_score_HEADERS += include/rtems/score/types.h diff --git a/cpukit/score/cpu/m68k/include/rtems/score/cpu.h b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h index 2be10c9638..fc6847f37e 100644 --- a/cpukit/score/cpu/m68k/include/rtems/score/cpu.h +++ b/cpukit/score/cpu/m68k/include/rtems/score/cpu.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include <rtems/score/types.h> +#include <rtems/score/basedefs.h> #include <rtems/score/m68k.h> /* conditional compilation parameters */ @@ -725,6 +725,8 @@ extern int (*_FPSP_install_raw_handler)( #endif +/** Type that can store a 32-bit integer or a pointer. */ +typedef uintptr_t CPU_Uint32ptr; #endif diff --git a/cpukit/score/cpu/m68k/include/rtems/score/types.h b/cpukit/score/cpu/m68k/include/rtems/score/types.h deleted file mode 100644 index 947c6ace69..0000000000 --- a/cpukit/score/cpu/m68k/include/rtems/score/types.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file - * - * @brief Motorola M68K CPU Type Definitions - * - * This include file contains type definitions pertaining to the Motorola - * m68xxx processor family. - */ - -/* - * COPYRIGHT (c) 1989-1999. - * 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; - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif |