From eb4536c37f55f3d49551838254bf04282f8ae21f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Apr 2002 14:05:25 +0000 Subject: 2001-04-03 Joel Sherrill * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. * rtems/score/mipstypes.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/mips/ChangeLog | 7 +++ c/src/exec/score/cpu/mips/Makefile.am | 2 +- c/src/exec/score/cpu/mips/rtems/score/cpu.h | 2 +- c/src/exec/score/cpu/mips/rtems/score/mipstypes.h | 57 ----------------- c/src/exec/score/cpu/mips64orion/ChangeLog | 7 +++ c/src/exec/score/cpu/mips64orion/Makefile.am | 2 +- c/src/exec/score/cpu/mips64orion/rtems/score/cpu.h | 2 +- .../score/cpu/mips64orion/rtems/score/mipstypes.h | 72 ---------------------- cpukit/score/cpu/mips/ChangeLog | 7 +++ cpukit/score/cpu/mips/Makefile.am | 2 +- cpukit/score/cpu/mips/rtems/score/cpu.h | 2 +- cpukit/score/cpu/mips64orion/ChangeLog | 7 +++ cpukit/score/cpu/mips64orion/Makefile.am | 2 +- cpukit/score/cpu/mips64orion/rtems/score/cpu.h | 2 +- 14 files changed, 36 insertions(+), 137 deletions(-) delete mode 100644 c/src/exec/score/cpu/mips/rtems/score/mipstypes.h delete mode 100644 c/src/exec/score/cpu/mips64orion/rtems/score/mipstypes.h diff --git a/c/src/exec/score/cpu/mips/ChangeLog b/c/src/exec/score/cpu/mips/ChangeLog index 5fe6854711..25d87c372a 100644 --- a/c/src/exec/score/cpu/mips/ChangeLog +++ b/c/src/exec/score/cpu/mips/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/mipstypes.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/mips/Makefile.am b/c/src/exec/score/cpu/mips/Makefile.am index 5ffaed88c0..ad139cce44 100644 --- a/c/src/exec/score/cpu/mips/Makefile.am +++ b/c/src/exec/score/cpu/mips/Makefile.am @@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/cpu.h \ rtems/score/mips.h \ - rtems/score/mipstypes.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/mips/rtems/score/cpu.h b/c/src/exec/score/cpu/mips/rtems/score/cpu.h index d422221d3a..43c7c33975 100644 --- a/c/src/exec/score/cpu/mips/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/mips/rtems/score/cpu.h @@ -45,7 +45,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif /* conditional compilation parameters */ diff --git a/c/src/exec/score/cpu/mips/rtems/score/mipstypes.h b/c/src/exec/score/cpu/mips/rtems/score/mipstypes.h deleted file mode 100644 index 3720032a76..0000000000 --- a/c/src/exec/score/cpu/mips/rtems/score/mipstypes.h +++ /dev/null @@ -1,57 +0,0 @@ -/* mipstypes.h - * - * This include file contains type definitions pertaining to the MIPS - * processor family. - * - * COPYRIGHT (c) 1989-2001. - * 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$ - */ -/* @(#)mipstypes.h 08/20/96 1.4 */ - -#ifndef __MIPS_TYPES_h -#define __MIPS_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 mips_isr; -typedef void ( *mips_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -/* end of include file */ diff --git a/c/src/exec/score/cpu/mips64orion/ChangeLog b/c/src/exec/score/cpu/mips64orion/ChangeLog index 40dca7969d..bf8abed3bf 100644 --- a/c/src/exec/score/cpu/mips64orion/ChangeLog +++ b/c/src/exec/score/cpu/mips64orion/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/mipstypes.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/mips64orion/Makefile.am b/c/src/exec/score/cpu/mips64orion/Makefile.am index ba78385e97..a67be091d0 100644 --- a/c/src/exec/score/cpu/mips64orion/Makefile.am +++ b/c/src/exec/score/cpu/mips64orion/Makefile.am @@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/cpu.h \ rtems/score/mips64orion.h \ - rtems/score/mipstypes.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/mips64orion/rtems/score/cpu.h b/c/src/exec/score/cpu/mips64orion/rtems/score/cpu.h index 684e6cfcf4..3138e331f1 100644 --- a/c/src/exec/score/cpu/mips64orion/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/mips64orion/rtems/score/cpu.h @@ -40,7 +40,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif extern int mips_disable_interrupts( void ); diff --git a/c/src/exec/score/cpu/mips64orion/rtems/score/mipstypes.h b/c/src/exec/score/cpu/mips64orion/rtems/score/mipstypes.h deleted file mode 100644 index 9d82f2a5d0..0000000000 --- a/c/src/exec/score/cpu/mips64orion/rtems/score/mipstypes.h +++ /dev/null @@ -1,72 +0,0 @@ -/* mipstypes.h - * - * This include file contains type definitions pertaining to the IDT 4650 - * processor family. - * - * Author: Craig Lebakken - * - * COPYRIGHT (c) 1996 by Transition Networks Inc. - * - * 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 Transition Networks not be used in - * advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * Transition Networks makes no representations about the suitability - * of this software for any purpose. - * - * 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$ - */ -/* @(#)mipstypes.h 08/20/96 1.4 */ - -#ifndef __MIPS_TYPES_h -#define __MIPS_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 mips_isr; -typedef void ( *mips_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -/* end of include file */ diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index 5fe6854711..25d87c372a 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/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/mipstypes.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/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am index 5ffaed88c0..ad139cce44 100644 --- a/cpukit/score/cpu/mips/Makefile.am +++ b/cpukit/score/cpu/mips/Makefile.am @@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/cpu.h \ rtems/score/mips.h \ - rtems/score/mipstypes.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/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/rtems/score/cpu.h index d422221d3a..43c7c33975 100644 --- a/cpukit/score/cpu/mips/rtems/score/cpu.h +++ b/cpukit/score/cpu/mips/rtems/score/cpu.h @@ -45,7 +45,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif /* conditional compilation parameters */ diff --git a/cpukit/score/cpu/mips64orion/ChangeLog b/cpukit/score/cpu/mips64orion/ChangeLog index 40dca7969d..bf8abed3bf 100644 --- a/cpukit/score/cpu/mips64orion/ChangeLog +++ b/cpukit/score/cpu/mips64orion/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/mipstypes.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/mips64orion/Makefile.am b/cpukit/score/cpu/mips64orion/Makefile.am index ba78385e97..a67be091d0 100644 --- a/cpukit/score/cpu/mips64orion/Makefile.am +++ b/cpukit/score/cpu/mips64orion/Makefile.am @@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/cpu.h \ rtems/score/mips64orion.h \ - rtems/score/mipstypes.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/mips64orion/rtems/score/cpu.h b/cpukit/score/cpu/mips64orion/rtems/score/cpu.h index 684e6cfcf4..3138e331f1 100644 --- a/cpukit/score/cpu/mips64orion/rtems/score/cpu.h +++ b/cpukit/score/cpu/mips64orion/rtems/score/cpu.h @@ -40,7 +40,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif extern int mips_disable_interrupts( void ); -- cgit v1.2.3