diff options
Diffstat (limited to 'cpukit')
45 files changed, 123 insertions, 189 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index f6f4293b45..87ac53356b 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h index 8f13d41c16..60b152fad5 100644 --- a/cpukit/score/cpu/arm/rtems/score/cpu.h +++ b/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 * diff --git a/cpukit/score/cpu/arm/rtems/score/types.h b/cpukit/score/cpu/arm/rtems/score/types.h index 16b988a107..1c07abe00e 100644 --- a/cpukit/score/cpu/arm/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/avr/ChangeLog b/cpukit/score/cpu/avr/ChangeLog index 0bc3987dbd..950790c25a 100644 --- a/cpukit/score/cpu/avr/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/avr/rtems/score/cpu.h b/cpukit/score/cpu/avr/rtems/score/cpu.h index 3b9281ff3c..d26469bf84 100644 --- a/cpukit/score/cpu/avr/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/avr/rtems/score/types.h b/cpukit/score/cpu/avr/rtems/score/types.h index dc03f66486..8bfdffa8a9 100644 --- a/cpukit/score/cpu/avr/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/bfin/ChangeLog b/cpukit/score/cpu/bfin/ChangeLog index 2cfff848bd..d08d3b3744 100644 --- a/cpukit/score/cpu/bfin/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/rtems/score/cpu.h index c688eb2686..a6b73e1b57 100644 --- a/cpukit/score/cpu/bfin/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/bfin/rtems/score/types.h b/cpukit/score/cpu/bfin/rtems/score/types.h index 5d7f084c79..b572f89e2d 100644 --- a/cpukit/score/cpu/bfin/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog index 246e9742e0..38f8155012 100644 --- a/cpukit/score/cpu/h8300/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/h8300/rtems/score/cpu.h b/cpukit/score/cpu/h8300/rtems/score/cpu.h index 7a89c26e30..679058aeb2 100644 --- a/cpukit/score/cpu/h8300/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/h8300/rtems/score/types.h b/cpukit/score/cpu/h8300/rtems/score/types.h index eafdb9932b..20bcf72543 100644 --- a/cpukit/score/cpu/h8300/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog index 4e8ebf03eb..382a27e6cf 100644 --- a/cpukit/score/cpu/i386/ChangeLog +++ b/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. diff --git a/cpukit/score/cpu/i386/rtems/score/cpu.h b/cpukit/score/cpu/i386/rtems/score/cpu.h index 731fcd73c7..a45db39e67 100644 --- a/cpukit/score/cpu/i386/rtems/score/cpu.h +++ b/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 diff --git a/cpukit/score/cpu/i386/rtems/score/types.h b/cpukit/score/cpu/i386/rtems/score/types.h index 522235087b..63a632abb4 100644 --- a/cpukit/score/cpu/i386/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/lm32/ChangeLog b/cpukit/score/cpu/lm32/ChangeLog index e3ae4fdead..a490f47e17 100644 --- a/cpukit/score/cpu/lm32/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/lm32/rtems/score/cpu.h b/cpukit/score/cpu/lm32/rtems/score/cpu.h index 7f8d4ba53f..a71b1ca4ec 100644 --- a/cpukit/score/cpu/lm32/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/lm32/rtems/score/types.h b/cpukit/score/cpu/lm32/rtems/score/types.h index b6e6a9fa03..bf3297844f 100644 --- a/cpukit/score/cpu/lm32/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/m32c/ChangeLog b/cpukit/score/cpu/m32c/ChangeLog index 1fc1256a49..c1bcfc2100 100644 --- a/cpukit/score/cpu/m32c/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/m32c/rtems/score/cpu.h b/cpukit/score/cpu/m32c/rtems/score/cpu.h index 817d062668..ef77ff45dd 100644 --- a/cpukit/score/cpu/m32c/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/m32c/rtems/score/types.h b/cpukit/score/cpu/m32c/rtems/score/types.h index 4ec65732ce..8b3c28f4ac 100644 --- a/cpukit/score/cpu/m32c/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #ifdef __cplusplus extern "C" { diff --git a/cpukit/score/cpu/m32r/ChangeLog b/cpukit/score/cpu/m32r/ChangeLog index a72d0fdcba..e2a5bf9842 100644 --- a/cpukit/score/cpu/m32r/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/m32r/rtems/score/cpu.h b/cpukit/score/cpu/m32r/rtems/score/cpu.h index e518cd8f75..b56953c9e6 100644 --- a/cpukit/score/cpu/m32r/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/m32r/rtems/score/types.h b/cpukit/score/cpu/m32r/rtems/score/types.h index e38e136c53..f435157466 100644 --- a/cpukit/score/cpu/m32r/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #ifdef __cplusplus extern "C" { diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index 0f89015a63..b9e3b9005d 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h index b4e1780bc6..e94034225c 100644 --- a/cpukit/score/cpu/m68k/rtems/score/cpu.h +++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h @@ -23,14 +23,8 @@ extern "C" { #endif -#include <rtems/score/m68k.h> /* pick up machine definitions */ -#ifndef ASM - #include <rtems/score/types.h> -#else - /* FIXME */ - #define TRUE 1 - #define FALSE 0 -#endif +#include <rtems/score/types.h> +#include <rtems/score/m68k.h> /* conditional compilation parameters */ diff --git a/cpukit/score/cpu/m68k/rtems/score/types.h b/cpukit/score/cpu/m68k/rtems/score/types.h index 4f756ffed2..1cd45ab1a2 100644 --- a/cpukit/score/cpu/m68k/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index 53cca28825..5f5643dac1 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/mips/rtems/score/cpu.h b/cpukit/score/cpu/mips/rtems/score/cpu.h index 13964ab235..c6592884ab 100644 --- a/cpukit/score/cpu/mips/rtems/score/cpu.h +++ b/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 - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - +#include <rtems/score/mips.h> /* conditional compilation parameters */ diff --git a/cpukit/score/cpu/mips/rtems/score/types.h b/cpukit/score/cpu/mips/rtems/score/types.h index 1bd5ae6669..e6a8de96bc 100644 --- a/cpukit/score/cpu/mips/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/nios2/ChangeLog b/cpukit/score/cpu/nios2/ChangeLog index 18fee9a2b4..dc4e2a3d45 100644 --- a/cpukit/score/cpu/nios2/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/nios2/rtems/score/cpu.h b/cpukit/score/cpu/nios2/rtems/score/cpu.h index f6ca30c691..7e7f30c97d 100644 --- a/cpukit/score/cpu/nios2/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/nios2/rtems/score/types.h b/cpukit/score/cpu/nios2/rtems/score/types.h index 3795195929..1c577a25c8 100644 --- a/cpukit/score/cpu/nios2/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog index 9ad3643067..770ec013b9 100644 --- a/cpukit/score/cpu/no_cpu/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h b/cpukit/score/cpu/no_cpu/rtems/score/cpu.h index c5a43f6ca3..d51a421efc 100644 --- a/cpukit/score/cpu/no_cpu/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/no_cpu/rtems/score/types.h b/cpukit/score/cpu/no_cpu/rtems/score/types.h index 1c2cee1023..89985a2d44 100644 --- a/cpukit/score/cpu/no_cpu/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #ifdef __cplusplus extern "C" { diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 77d99344c6..22f0eb2247 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/sh/rtems/score/cpu.h b/cpukit/score/cpu/sh/rtems/score/cpu.h index 857cadefa6..946b58cac5 100644 --- a/cpukit/score/cpu/sh/rtems/score/cpu.h +++ b/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 -#if 0 && defined(__SH4__) -#include <rtems/score/sh4_regs.h> -#endif +#include <rtems/score/sh.h> /* conditional compilation parameters */ diff --git a/cpukit/score/cpu/sh/rtems/score/types.h b/cpukit/score/cpu/sh/rtems/score/types.h index 7a159d28b9..bb17f96b61 100644 --- a/cpukit/score/cpu/sh/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index 5016d21b03..4d61d859dc 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h index 2b2b0f5b32..11984ea057 100644 --- a/cpukit/score/cpu/sparc/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/sparc/rtems/score/types.h b/cpukit/score/cpu/sparc/rtems/score/types.h index 6368b39ccc..d5cb6a6283 100644 --- a/cpukit/score/cpu/sparc/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 diff --git a/cpukit/score/cpu/sparc64/ChangeLog b/cpukit/score/cpu/sparc64/ChangeLog index 169e2da61d..3a34d37551 100644 --- a/cpukit/score/cpu/sparc64/ChangeLog +++ b/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 diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpu.h b/cpukit/score/cpu/sparc64/rtems/score/cpu.h index d3c0bb6ec1..70315d3382 100644 --- a/cpukit/score/cpu/sparc64/rtems/score/cpu.h +++ b/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 */ diff --git a/cpukit/score/cpu/sparc64/rtems/score/types.h b/cpukit/score/cpu/sparc64/rtems/score/types.h index 3e86ba68a5..15009b5a1d 100644 --- a/cpukit/score/cpu/sparc64/rtems/score/types.h +++ b/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> -#include <stdint.h> +#ifndef ASM #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 |