summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--c/src/exec/score/cpu/m68k/ChangeLog6
-rw-r--r--c/src/exec/score/cpu/m68k/Makefile.am2
-rw-r--r--c/src/exec/score/cpu/m68k/rtems/score/cpu.h2
-rw-r--r--c/src/exec/score/cpu/m68k/rtems/score/m68k.h2
-rw-r--r--c/src/exec/score/cpu/m68k/rtems/score/m68ktypes.h57
-rw-r--r--c/src/lib/libcpu/sh/sh7750/ChangeLog6
-rw-r--r--c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h2
-rw-r--r--c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c2
-rw-r--r--cpukit/score/cpu/m68k/ChangeLog6
-rw-r--r--cpukit/score/cpu/m68k/Makefile.am2
-rw-r--r--cpukit/score/cpu/m68k/rtems/score/cpu.h2
-rw-r--r--cpukit/score/cpu/m68k/rtems/score/m68k.h2
12 files changed, 26 insertions, 65 deletions
diff --git a/c/src/exec/score/cpu/m68k/ChangeLog b/c/src/exec/score/cpu/m68k/ChangeLog
index c4297afd3c..565aa3bd33 100644
--- a/c/src/exec/score/cpu/m68k/ChangeLog
+++ b/c/src/exec/score/cpu/m68k/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-03 Joel Sherrill <joel@OARcorp.com>
+
+ * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
+ * include/rtems/score/ispsh7750.h, score/ispsh7750.c: Account for
+ name change.
+
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac:
diff --git a/c/src/exec/score/cpu/m68k/Makefile.am b/c/src/exec/score/cpu/m68k/Makefile.am
index 87ace993e8..8572a41a85 100644
--- a/c/src/exec/score/cpu/m68k/Makefile.am
+++ b/c/src/exec/score/cpu/m68k/Makefile.am
@@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score
include_rtems_score_HEADERS = \
rtems/score/cpu.h \
rtems/score/m68k.h \
- rtems/score/m68ktypes.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/m68k/rtems/score/cpu.h b/c/src/exec/score/cpu/m68k/rtems/score/cpu.h
index 7ee4bc0110..d988b4e4eb 100644
--- a/c/src/exec/score/cpu/m68k/rtems/score/cpu.h
+++ b/c/src/exec/score/cpu/m68k/rtems/score/cpu.h
@@ -22,7 +22,7 @@ extern "C" {
#include <rtems/score/m68k.h> /* pick up machine definitions */
#ifndef ASM
-#include <rtems/score/m68ktypes.h>
+#include <rtems/score/types.h>
#endif
/* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/m68k/rtems/score/m68k.h b/c/src/exec/score/cpu/m68k/rtems/score/m68k.h
index 5bd7fd5d47..8f9133a774 100644
--- a/c/src/exec/score/cpu/m68k/rtems/score/m68k.h
+++ b/c/src/exec/score/cpu/m68k/rtems/score/m68k.h
@@ -230,7 +230,7 @@ extern "C" {
#endif
#ifndef ASM
-#include <rtems/score/m68ktypes.h>
+#include <rtems/score/types.h>
#endif
/*
diff --git a/c/src/exec/score/cpu/m68k/rtems/score/m68ktypes.h b/c/src/exec/score/cpu/m68k/rtems/score/m68ktypes.h
deleted file mode 100644
index 7b1a1c643e..0000000000
--- a/c/src/exec/score/cpu/m68k/rtems/score/m68ktypes.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* m68ktypes.h
- *
- * This include file contains type definitions pertaining to the Motorola
- * m68xxx 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 __M68k_TYPES_h
-#define __M68k_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 m68k_isr;
-
-typedef void ( *m68k_isr_entry )( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif
-/* end of include file */
diff --git a/c/src/lib/libcpu/sh/sh7750/ChangeLog b/c/src/lib/libcpu/sh/sh7750/ChangeLog
index 1b2da34779..16591ba74f 100644
--- a/c/src/lib/libcpu/sh/sh7750/ChangeLog
+++ b/c/src/lib/libcpu/sh/sh7750/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-03 Joel Sherrill <joel@OARcorp.com>
+
+ * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
+ * include/rtems/score/ispsh7750.h, score/ispsh7750.c: Account for
+ name change.
+
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac:
diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h b/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h
index c4b1c04203..8c20b0e397 100644
--- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h
+++ b/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h
@@ -45,7 +45,7 @@
extern "C" {
#endif
-#include <rtems/score/shtypes.h>
+#include <rtems/score/types.h>
/* dummy ISP */
extern void _dummy_isp( void );
diff --git a/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c b/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c
index bcb686aca8..bc39c32557 100644
--- a/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c
+++ b/c/src/lib/libcpu/sh/sh7750/score/ispsh7750.c
@@ -38,7 +38,7 @@
*/
#include <rtems/system.h>
-#include <rtems/score/shtypes.h>
+#include <rtems/score/types.h>
#include <rtems/score/isr.h>
/*
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index c4297afd3c..565aa3bd33 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-03 Joel Sherrill <joel@OARcorp.com>
+
+ * Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
+ * include/rtems/score/ispsh7750.h, score/ispsh7750.c: Account for
+ name change.
+
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac:
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 87ace993e8..8572a41a85 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score
include_rtems_score_HEADERS = \
rtems/score/cpu.h \
rtems/score/m68k.h \
- rtems/score/m68ktypes.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/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index 7ee4bc0110..d988b4e4eb 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -22,7 +22,7 @@ extern "C" {
#include <rtems/score/m68k.h> /* pick up machine definitions */
#ifndef ASM
-#include <rtems/score/m68ktypes.h>
+#include <rtems/score/types.h>
#endif
/* conditional compilation parameters */
diff --git a/cpukit/score/cpu/m68k/rtems/score/m68k.h b/cpukit/score/cpu/m68k/rtems/score/m68k.h
index 5bd7fd5d47..8f9133a774 100644
--- a/cpukit/score/cpu/m68k/rtems/score/m68k.h
+++ b/cpukit/score/cpu/m68k/rtems/score/m68k.h
@@ -230,7 +230,7 @@ extern "C" {
#endif
#ifndef ASM
-#include <rtems/score/m68ktypes.h>
+#include <rtems/score/types.h>
#endif
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 21:32:24 +0000