summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-03 14:07:20 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-03 14:07:20 +0000
commitfa1dbc076a5f73552c79899c68580c08e60b5501 (patch)
tree7675f20f8257e334dda334c8cde5e9f0fff8c8b7 /c
parent22ed9d0ff1d288560b2604750150d22e3614a8f2 (diff)
downloadrtems-fa1dbc076a5f73552c79899c68580c08e60b5501.tar.bz2
2001-04-03 Joel Sherrill <joel@OARcorp.com>
* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h. * rtems/score/unixtypes.h: Removed. * rtems/score/types.h: New file via CVS magic. * Makefile.am, rtems/score/cpu.h: Account for name change.
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/score/cpu/unix/ChangeLog7
-rw-r--r--c/src/exec/score/cpu/unix/Makefile.am2
-rw-r--r--c/src/exec/score/cpu/unix/rtems/score/cpu.h2
-rw-r--r--c/src/exec/score/cpu/unix/rtems/score/unixtypes.h71
4 files changed, 9 insertions, 73 deletions
diff --git a/c/src/exec/score/cpu/unix/ChangeLog b/c/src/exec/score/cpu/unix/ChangeLog
index f587d1b9fb..1510ea7078 100644
--- a/c/src/exec/score/cpu/unix/ChangeLog
+++ b/c/src/exec/score/cpu/unix/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-03 Joel Sherrill <joel@OARcorp.com>
+
+ * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
+ * rtems/score/unixtypes.h: Removed.
+ * rtems/score/types.h: New file via CVS magic.
+ * Makefile.am, rtems/score/cpu.h: Account for name change.
+
2001-03-28 Joel Sherrill <joel@OARcorp.com>
* cpu.c: Define fix_syscall_errno() to nothing so MP links.
diff --git a/c/src/exec/score/cpu/unix/Makefile.am b/c/src/exec/score/cpu/unix/Makefile.am
index a941abf2c1..1f3916fd8d 100644
--- a/c/src/exec/score/cpu/unix/Makefile.am
+++ b/c/src/exec/score/cpu/unix/Makefile.am
@@ -24,7 +24,7 @@ $(PROJECT_INCLUDE)/rtems/score:
include_rtems_scoredir = $(includedir)/rtems/score
include_rtems_score_HEADERS = \
- rtems/score/unixtypes.h \
+ rtems/score/types.h \
rtems/score/cpu.h \
rtems/score/unix.h \
rtems/score/unixsize.h
diff --git a/c/src/exec/score/cpu/unix/rtems/score/cpu.h b/c/src/exec/score/cpu/unix/rtems/score/cpu.h
index 984b414281..644fbb4b86 100644
--- a/c/src/exec/score/cpu/unix/rtems/score/cpu.h
+++ b/c/src/exec/score/cpu/unix/rtems/score/cpu.h
@@ -21,7 +21,7 @@ extern "C" {
#include <rtems/score/unix.h> /* pick up machine definitions */
#ifndef ASM
-#include <rtems/score/unixtypes.h>
+#include <rtems/score/types.h>
#endif
#include <rtems/score/unixsize.h>
diff --git a/c/src/exec/score/cpu/unix/rtems/score/unixtypes.h b/c/src/exec/score/cpu/unix/rtems/score/unixtypes.h
deleted file mode 100644
index f423564ebc..0000000000
--- a/c/src/exec/score/cpu/unix/rtems/score/unixtypes.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* unixtypes.h
- *
- * This include file contains type definitions which are appropriate
- * for a typical modern UNIX box using GNU C for the RTEMS simulator.
- *
- * 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 __UNIX_TYPES_h
-#define __UNIX_TYPES_h
-
-#ifndef ASM
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * some C++ compilers (eg: HP's) don't do 'signed' or 'volatile'
- */
-#if defined(__cplusplus) && !defined(__GNUC__)
-#define signed
-#define volatile
-#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 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 */
-
-/*
- * some C++ compilers (eg: HP's) don't do 'long long'
- */
-#if defined(__GNUC__)
-typedef unsigned long long unsigned64; /* unsigned 64-bit integer */
-typedef signed long long signed64; /* 64 bit signed integer */
-#endif
-
-typedef unsigned32 boolean; /* Boolean value */
-
-typedef float single_precision; /* single precision float */
-typedef double double_precision; /* double precision float */
-
-typedef void unix_isr;
-
-typedef unix_isr ( *unix_isr_entry )( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif
-/* end of include file */