From 68f0058cd7643923af0e9ff154fe31156586f1c0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Apr 2002 14:02:41 +0000 Subject: 2001-04-03 Joel Sherrill * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. * rtems/score/a29ktypes.h: Removed. * rtems/score/types.h: New file via CVS magic. * Makefile.am, rtems/score/cpu.h: Account for name change. --- c/src/exec/score/cpu/a29k/ChangeLog | 7 +++ c/src/exec/score/cpu/a29k/Makefile.am | 2 +- c/src/exec/score/cpu/a29k/rtems/score/a29ktypes.h | 56 ----------------------- c/src/exec/score/cpu/a29k/rtems/score/cpu.h | 2 +- c/src/exec/score/cpu/arm/ChangeLog | 7 +++ c/src/exec/score/cpu/arm/Makefile.am | 2 +- c/src/exec/score/cpu/arm/rtems/score/armtypes.h | 55 ---------------------- c/src/exec/score/cpu/arm/rtems/score/cpu.h | 2 +- cpukit/score/cpu/a29k/ChangeLog | 7 +++ cpukit/score/cpu/a29k/Makefile.am | 2 +- cpukit/score/cpu/a29k/rtems/score/cpu.h | 2 +- cpukit/score/cpu/arm/ChangeLog | 7 +++ cpukit/score/cpu/arm/Makefile.am | 2 +- cpukit/score/cpu/arm/rtems/score/cpu.h | 2 +- 14 files changed, 36 insertions(+), 119 deletions(-) delete mode 100644 c/src/exec/score/cpu/a29k/rtems/score/a29ktypes.h delete mode 100644 c/src/exec/score/cpu/arm/rtems/score/armtypes.h diff --git a/c/src/exec/score/cpu/a29k/ChangeLog b/c/src/exec/score/cpu/a29k/ChangeLog index 4da47d0e31..d96fb282a8 100644 --- a/c/src/exec/score/cpu/a29k/ChangeLog +++ b/c/src/exec/score/cpu/a29k/ChangeLog @@ -1,3 +1,10 @@ +2001-04-03 Joel Sherrill + + * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. + * rtems/score/a29ktypes.h: Removed. + * rtems/score/types.h: New file via CVS magic. + * Makefile.am, rtems/score/cpu.h: Account for name change. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/c/src/exec/score/cpu/a29k/Makefile.am b/c/src/exec/score/cpu/a29k/Makefile.am index a8689053e8..37292013b8 100644 --- a/c/src/exec/score/cpu/a29k/Makefile.am +++ b/c/src/exec/score/cpu/a29k/Makefile.am @@ -26,7 +26,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/a29k.h \ - rtems/score/a29ktypes.h \ + rtems/score/types.h \ rtems/score/cpu.h \ rtems/score/cpu_asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ diff --git a/c/src/exec/score/cpu/a29k/rtems/score/a29ktypes.h b/c/src/exec/score/cpu/a29k/rtems/score/a29ktypes.h deleted file mode 100644 index 130fd30dd4..0000000000 --- a/c/src/exec/score/cpu/a29k/rtems/score/a29ktypes.h +++ /dev/null @@ -1,56 +0,0 @@ -/* no_cputypes.h - * - * This include file contains type definitions pertaining to the Intel - * no_cpu 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.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#ifndef __NO_CPU_TYPES_h -#define __NO_CPU_TYPES_h - -#ifndef ASM - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This section defines the basic types for this processor. - */ - -typedef unsigned char unsigned8; /* unsigned 8-bit integer */ -typedef unsigned short unsigned16; /* unsigned 16-bit integer */ -typedef unsigned int unsigned32; /* unsigned 32-bit integer */ -typedef unsigned long unsigned64; /* unsigned 64-bit integer */ - -typedef unsigned16 Priority_Bit_map_control; - -typedef signed char signed8; /* 8-bit signed integer */ -typedef signed short signed16; /* 16-bit signed integer */ -typedef signed int signed32; /* 32-bit signed integer */ -typedef signed long signed64; /* 64 bit signed integer */ - -typedef unsigned32 boolean; /* Boolean value */ - -typedef float single_precision; /* single precision float */ -typedef double double_precision; /* double precision float */ - -typedef void no_cpu_isr; -typedef void ( *no_cpu_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -/* end of include file */ diff --git a/c/src/exec/score/cpu/a29k/rtems/score/cpu.h b/c/src/exec/score/cpu/a29k/rtems/score/cpu.h index 8afa432865..a20543f0d2 100644 --- a/c/src/exec/score/cpu/a29k/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/a29k/rtems/score/cpu.h @@ -40,7 +40,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif extern unsigned int a29k_disable( void ); diff --git a/c/src/exec/score/cpu/arm/ChangeLog b/c/src/exec/score/cpu/arm/ChangeLog index bd24e9bc73..75f773c7e9 100644 --- a/c/src/exec/score/cpu/arm/ChangeLog +++ b/c/src/exec/score/cpu/arm/ChangeLog @@ -1,3 +1,10 @@ +2001-04-03 Joel Sherrill + + * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. + * rtems/score/a29ktypes.h: Removed. + * rtems/score/types.h: New file via CVS magic. + * Makefile.am, rtems/score/cpu.h: Account for name change. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/c/src/exec/score/cpu/arm/Makefile.am b/c/src/exec/score/cpu/arm/Makefile.am index e1a9b65dc1..972edd942b 100644 --- a/c/src/exec/score/cpu/arm/Makefile.am +++ b/c/src/exec/score/cpu/arm/Makefile.am @@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/cpu.h \ rtems/score/arm.h \ - rtems/score/armtypes.h + rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) diff --git a/c/src/exec/score/cpu/arm/rtems/score/armtypes.h b/c/src/exec/score/cpu/arm/rtems/score/armtypes.h deleted file mode 100644 index 4408046d4e..0000000000 --- a/c/src/exec/score/cpu/arm/rtems/score/armtypes.h +++ /dev/null @@ -1,55 +0,0 @@ -/* armtypes.h - * - * This include file contains type definitions pertaining to the - * arm processor family. - * - * COPYRIGHT (c) 2000 Canon Research Centre France SA. - * Emmanuel Raguet, mailto:raguet@crf.canon.fr - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - */ - -#ifndef __ARM_TYPES_h -#define __ARM_TYPES_h - -#ifndef ASM - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This section defines the basic types for this processor. - */ - -typedef unsigned char unsigned8; /* unsigned 8-bit integer */ -typedef unsigned short unsigned16; /* unsigned 16-bit integer */ -typedef unsigned int unsigned32; /* unsigned 32-bit integer */ -typedef unsigned long long unsigned64; /* unsigned 64-bit integer */ - -typedef unsigned16 Priority_Bit_map_control; - -typedef signed char signed8; /* 8-bit signed integer */ -typedef signed short signed16; /* 16-bit signed integer */ -typedef signed int signed32; /* 32-bit signed integer */ -typedef signed long long signed64; /* 64 bit signed integer */ - -typedef unsigned32 boolean; /* Boolean value */ - -typedef float single_precision; /* single precision float */ -typedef double double_precision; /* double precision float */ - -typedef void no_cpu_isr; -typedef void ( *no_cpu_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -/* end of include file */ diff --git a/c/src/exec/score/cpu/arm/rtems/score/cpu.h b/c/src/exec/score/cpu/arm/rtems/score/cpu.h index 62adccfe5d..ebe494504b 100644 --- a/c/src/exec/score/cpu/arm/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/arm/rtems/score/cpu.h @@ -21,7 +21,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif /* conditional compilation parameters */ diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog index 4da47d0e31..d96fb282a8 100644 --- a/cpukit/score/cpu/a29k/ChangeLog +++ b/cpukit/score/cpu/a29k/ChangeLog @@ -1,3 +1,10 @@ +2001-04-03 Joel Sherrill + + * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. + * rtems/score/a29ktypes.h: Removed. + * rtems/score/types.h: New file via CVS magic. + * Makefile.am, rtems/score/cpu.h: Account for name change. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/cpukit/score/cpu/a29k/Makefile.am b/cpukit/score/cpu/a29k/Makefile.am index a8689053e8..37292013b8 100644 --- a/cpukit/score/cpu/a29k/Makefile.am +++ b/cpukit/score/cpu/a29k/Makefile.am @@ -26,7 +26,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/a29k.h \ - rtems/score/a29ktypes.h \ + rtems/score/types.h \ rtems/score/cpu.h \ rtems/score/cpu_asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ diff --git a/cpukit/score/cpu/a29k/rtems/score/cpu.h b/cpukit/score/cpu/a29k/rtems/score/cpu.h index 8afa432865..a20543f0d2 100644 --- a/cpukit/score/cpu/a29k/rtems/score/cpu.h +++ b/cpukit/score/cpu/a29k/rtems/score/cpu.h @@ -40,7 +40,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif extern unsigned int a29k_disable( void ); diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index bd24e9bc73..75f773c7e9 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,3 +1,10 @@ +2001-04-03 Joel Sherrill + + * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. + * rtems/score/a29ktypes.h: Removed. + * rtems/score/types.h: New file via CVS magic. + * Makefile.am, rtems/score/cpu.h: Account for name change. + 2002-03-27 Ralf Corsepius * configure.ac: diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am index e1a9b65dc1..972edd942b 100644 --- a/cpukit/score/cpu/arm/Makefile.am +++ b/cpukit/score/cpu/arm/Makefile.am @@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/cpu.h \ rtems/score/arm.h \ - rtems/score/armtypes.h + rtems/score/types.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h index 62adccfe5d..ebe494504b 100644 --- a/cpukit/score/cpu/arm/rtems/score/cpu.h +++ b/cpukit/score/cpu/arm/rtems/score/cpu.h @@ -21,7 +21,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif /* conditional compilation parameters */ -- cgit v1.2.3