From 8c82fa79a6ed0f0e003d69aa9e9b8306804c6414 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 3 Apr 2002 14:04:21 +0000 Subject: 2001-04-03 Joel Sherrill * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. * rtems/score/i386types.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/i386/ChangeLog | 7 +++ c/src/exec/score/cpu/i386/Makefile.am | 2 +- c/src/exec/score/cpu/i386/rtems/score/cpu.h | 2 +- c/src/exec/score/cpu/i386/rtems/score/i386types.h | 57 ----------------------- 4 files changed, 9 insertions(+), 59 deletions(-) delete mode 100644 c/src/exec/score/cpu/i386/rtems/score/i386types.h (limited to 'c') diff --git a/c/src/exec/score/cpu/i386/ChangeLog b/c/src/exec/score/cpu/i386/ChangeLog index 0930b8564d..96bf0ec9e9 100644 --- a/c/src/exec/score/cpu/i386/ChangeLog +++ b/c/src/exec/score/cpu/i386/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/i386types.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/i386/Makefile.am b/c/src/exec/score/cpu/i386/Makefile.am index f81c4f1bbe..f26300f0f9 100644 --- a/c/src/exec/score/cpu/i386/Makefile.am +++ b/c/src/exec/score/cpu/i386/Makefile.am @@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score include_rtems_score_HEADERS = \ rtems/score/cpu.h \ rtems/score/i386.h \ - rtems/score/i386types.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/i386/rtems/score/cpu.h b/c/src/exec/score/cpu/i386/rtems/score/cpu.h index f303a89cb8..b601bcf7ea 100644 --- a/c/src/exec/score/cpu/i386/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/i386/rtems/score/cpu.h @@ -24,7 +24,7 @@ extern "C" { #include #ifndef ASM -#include +#include #endif /* conditional compilation parameters */ diff --git a/c/src/exec/score/cpu/i386/rtems/score/i386types.h b/c/src/exec/score/cpu/i386/rtems/score/i386types.h deleted file mode 100644 index 1b9091f501..0000000000 --- a/c/src/exec/score/cpu/i386/rtems/score/i386types.h +++ /dev/null @@ -1,57 +0,0 @@ -/* i386types.h - * - * This include file contains type definitions pertaining to the Intel - * i386 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 __i386_TYPES_h -#define __i386_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 i386_isr; - -typedef i386_isr ( *i386_isr_entry )( void ); - -#ifdef __cplusplus -} -#endif - -#endif /* !ASM */ - -#endif -/* end of include file */ -- cgit v1.2.3