2010-07-16 Sebastian Huber <sebastian.huber@embedded-brains.de>

* rtems/score/cpu.h: Include <rtems/score/types.h> first.
	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.

cpukit/score/cpu/arm/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-07-06	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* rtems/score/cpu.h: Removed CPU_ENABLE_C_ISR_DISPATCH_IMPLEMENTATION

cpukit/score/cpu/arm/rtems/score/cpu.h

@@ -33,22 +33,9 @@
 #ifndef _RTEMS_SCORE_CPU_H
 #define _RTEMS_SCORE_CPU_H
 
+#include <rtems/score/types.h>
 #include <rtems/score/arm.h>
 
-#ifndef ASM
-  #include <rtems/score/types.h>
-#endif
-
-#ifndef TRUE
-  #warning "TRUE not defined"
-  #define TRUE 1
-#endif
-
-#ifndef FALSE
-  #warning "FALSE not defined"
-  #define FALSE 0
-#endif
-
 /**
  * @defgroup ScoreCPUARM ARM Specific Support
  *

cpukit/score/cpu/arm/rtems/score/types.h

@@ -24,10 +24,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,12 +44,6 @@ extern "C" {
 
 typedef uint16_t         Priority_Bit_map_control;
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool		boolean;            /* Boolean value   */
-typedef float           single_precision;   /* single precision float */
-typedef double          double_precision;   /* double precision float */
-#endif
-
 /** @} */
 
 #ifdef __cplusplus

cpukit/score/cpu/avr/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/avr/rtems/score/cpu.h

@@ -23,11 +23,9 @@
 extern "C" {
 #endif
 
-#include <rtems/score/avr.h>            /* pick up machine definitions */
-#include <avr/common.h>
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/avr.h>
+#include <avr/common.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/avr/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t     Priority_Bit_map_control;
 typedef void avr_isr;
 typedef void ( *avr_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/bfin/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/bfin/rtems/score/cpu.h

@@ -25,10 +25,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/bfin.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/bfin.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/bfin/rtems/score/types.h

@@ -15,10 +15,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,12 +36,6 @@ typedef void blackfin_isr;
 /** This defines the prototype for an ISR entry point. */
 typedef blackfin_isr ( *blackfin_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/h8300/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/h8300/rtems/score/cpu.h

@@ -23,10 +23,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/h8300.h>               /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/h8300.h>
 
 #include <rtems/bspIo.h>	/* printk */
 

cpukit/score/cpu/h8300/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t     Priority_Bit_map_control;
 typedef void h8300_isr;
 typedef void ( *h8300_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/i386/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-15	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* cpu_asm.S: Formatting.

cpukit/score/cpu/i386/rtems/score/cpu.h

@@ -27,10 +27,10 @@
 extern "C" {
 #endif
 
-#include <rtems/score/i386.h>              /* pick up machine definitions */
+#include <rtems/score/types.h>
+#include <rtems/score/i386.h>
 
 #ifndef ASM
-#include <rtems/score/types.h>
 #include <rtems/score/interrupts.h>	/* formerly in libcpu/cpu.h> */
 #include <rtems/score/registers.h>	/* formerly part of libcpu */
 #endif

cpukit/score/cpu/i386/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t Priority_Bit_map_control;
 typedef void i386_isr;
 typedef i386_isr ( *i386_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool 		boolean;              /* Boolean value   */
-typedef float		single_precision;     /* single precision float */
-typedef double		double_precision;     /* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/lm32/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/lm32/rtems/score/cpu.h

@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/lm32.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/lm32.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/lm32/rtems/score/types.h

@@ -22,10 +22,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,12 +43,6 @@ typedef void lm32_isr;
 /** This defines the prototype for an ISR entry point. */
 typedef lm32_isr ( *lm32_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/m32c/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/m32c/rtems/score/cpu.h

@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/m32c.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/m32c.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/m32c/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

cpukit/score/cpu/m32r/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/m32r/rtems/score/cpu.h

@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/m32r.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/m32r.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/m32r/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

cpukit/score/cpu/m68k/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/m68k/rtems/score/cpu.h

@@ -23,14 +23,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/m68k.h>              /* pick up machine definitions */
+#include <rtems/score/types.h>
-#ifndef ASM
+#include <rtems/score/m68k.h>
-  #include <rtems/score/types.h>
-#else
-  /* FIXME */
-  #define TRUE 1
-  #define FALSE 0
-#endif
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/m68k/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t     Priority_Bit_map_control;
 typedef void m68k_isr;
 typedef void ( *m68k_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/mips/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-07-01	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* rtems/asm.h, rtems/score/cpu.h: cpu.h defines were not available to

cpukit/score/cpu/mips/rtems/score/cpu.h

@@ -43,18 +43,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/mips.h>       /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/mips.h>
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/mips/rtems/score/types.h

@@ -20,10 +20,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,12 +36,6 @@ typedef uint16_t     Priority_Bit_map_control;
 typedef void mips_isr;
 typedef void ( *mips_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool 	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/nios2/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/nios2/rtems/score/cpu.h

@@ -36,10 +36,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/nios2.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/nios2.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/nios2/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t Priority_Bit_map_control;
 typedef void nios2_isr;
 typedef void ( *nios2_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;     		/* Boolean value   */
-typedef float	single_precision;	/* single precision float */
-typedef double	double_precision;	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/no_cpu/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/no_cpu/rtems/score/cpu.h

@@ -37,10 +37,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/no_cpu.h>            /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/no_cpu.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/no_cpu/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

cpukit/score/cpu/sh/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/sh/rtems/score/cpu.h

@@ -33,13 +33,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/sh.h>              /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/sh.h>
-#if 0 && defined(__SH4__)
-#include <rtems/score/sh4_regs.h>
-#endif
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/sh/rtems/score/types.h

@@ -29,10 +29,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,12 +46,6 @@ typedef uint16_t     Priority_Bit_map_control;
 typedef void sh_isr;
 typedef void ( *sh_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool boolean;	     			/* Boolean value, external */
-typedef float          single_precision;     	/* single precision float */
-typedef double         double_precision;     	/* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/sparc/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-28	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1573/cpukit

cpukit/score/cpu/sparc/rtems/score/cpu.h

@@ -23,10 +23,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/sparc.h>               /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/sparc.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/sparc/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t         Priority_Bit_map_control;
 typedef void sparc_isr;
 typedef void ( *sparc_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;              /* Boolean value   */
-typedef float	single_precision;     /* single precision float */
-typedef double	double_precision;     /* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif

cpukit/score/cpu/sparc64/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-16	Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+	* rtems/score/cpu.h: Include <rtems/score/types.h> first.
+	* rtems/score/types.h: Use <rtems/score/basedefs.h> header file.
+
 2010-06-15	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	PR 1561/cpukit

cpukit/score/cpu/sparc64/rtems/score/cpu.h

@@ -27,10 +27,8 @@
 extern "C" {
 #endif
 
-#include <rtems/score/sparc64.h>               /* pick up machine definitions */
-#ifndef ASM
 #include <rtems/score/types.h>
-#endif
+#include <rtems/score/sparc64.h>
 
 /* conditional compilation parameters */
 

cpukit/score/cpu/sparc64/rtems/score/types.h

@@ -19,10 +19,9 @@
 #ifndef _RTEMS_SCORE_TYPES_H
 #define _RTEMS_SCORE_TYPES_H
 
-#ifndef ASM
+#include <rtems/score/basedefs.h>
 
-#include <stdbool.h>
+#ifndef ASM
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,12 +35,6 @@ typedef uint16_t         Priority_Bit_map_control;
 typedef void sparc_isr;
 typedef void ( *sparc_isr_entry )( void );
 
-#ifdef RTEMS_DEPRECATED_TYPES
-typedef bool	boolean;              /* Boolean value   */
-typedef float	single_precision;     /* single precision float */
-typedef double	double_precision;     /* double precision float */
-#endif
-
 #ifdef __cplusplus
 }
 #endif