From 64ef77cd56b04e8808897cf928636d72248381fb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Apr 2002 14:05:58 +0000 Subject: 2001-04-03 Joel Sherrill * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. * rtems/score/or16types.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/or16/ChangeLog | 7 +++ c/src/exec/score/cpu/or16/Makefile.am | 2 +- c/src/exec/score/cpu/or16/rtems/score/cpu.h | 2 +- c/src/exec/score/cpu/or16/rtems/score/or16types.h | 56 ----------------------- cpukit/score/cpu/or16/ChangeLog | 7 +++ cpukit/score/cpu/or16/Makefile.am | 2 +- cpukit/score/cpu/or16/rtems/score/cpu.h | 2 +- 7 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 c/src/exec/score/cpu/or16/rtems/score/or16types.h diff --git a/c/src/exec/score/cpu/or16/ChangeLog b/c/src/exec/score/cpu/or16/ChangeLog index 85dfcc9911..1bacf47413 100644 --- a/c/src/exec/score/cpu/or16/ChangeLog +++ b/c/src/exec/score/cpu/or16/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/or16types.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/or16/Makefile.am b/c/src/exec/score/cpu/or16/Makefile.am index 699dc067fa..6775f67956 100644 --- a/c/src/exec/score/cpu/or16/Makefile.am +++ b/c/src/exec/score/cpu/or16/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/cpu.h \ - rtems/score/or16types.h \ + rtems/score/types.h \ rtems/score/or16.h \ rtems/score/cpu_asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ diff --git a/c/src/exec/score/cpu/or16/rtems/score/cpu.h b/c/src/exec/score/cpu/or16/rtems/score/cpu.h index f5991461c2..71da86570a 100644 --- a/c/src/exec/score/cpu/or16/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/or16/rtems/score/cpu.h @@ -22,7 +22,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif /* conditional compilation parameters */ diff --git a/c/src/exec/score/cpu/or16/rtems/score/or16types.h b/c/src/exec/score/cpu/or16/rtems/score/or16types.h deleted file mode 100644 index 43eba2287d..0000000000 --- a/c/src/exec/score/cpu/or16/rtems/score/or16types.h +++ /dev/null @@ -1,56 +0,0 @@ -/* or16types.h - * - * This include file contains type definitions pertaining to the Intel - * or16 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 __OR16_TYPES_h -#define __OR16_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 or16_isr; -typedef void ( *or16_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -/* end of include file */ diff --git a/cpukit/score/cpu/or16/ChangeLog b/cpukit/score/cpu/or16/ChangeLog index 85dfcc9911..1bacf47413 100644 --- a/cpukit/score/cpu/or16/ChangeLog +++ b/cpukit/score/cpu/or16/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/or16types.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/or16/Makefile.am b/cpukit/score/cpu/or16/Makefile.am index 699dc067fa..6775f67956 100644 --- a/cpukit/score/cpu/or16/Makefile.am +++ b/cpukit/score/cpu/or16/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/cpu.h \ - rtems/score/or16types.h \ + rtems/score/types.h \ rtems/score/or16.h \ rtems/score/cpu_asm.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ diff --git a/cpukit/score/cpu/or16/rtems/score/cpu.h b/cpukit/score/cpu/or16/rtems/score/cpu.h index f5991461c2..71da86570a 100644 --- a/cpukit/score/cpu/or16/rtems/score/cpu.h +++ b/cpukit/score/cpu/or16/rtems/score/cpu.h @@ -22,7 +22,7 @@ extern "C" { #include /* pick up machine definitions */ #ifndef ASM -#include +#include #endif /* conditional compilation parameters */ -- cgit v1.2.3