diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-07-16 08:46:29 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-07-16 08:46:29 +0000 |
| commit | 89b85e510043235a115fe02b4ea97712a23cfd2b (patch) | |
| tree | c090ddb62e7481e69514fa7f067ee40b29ab7ac3 /cpukit/score/cpu/avr | |
| parent | 2010-07-16 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-89b85e510043235a115fe02b4ea97712a23cfd2b.tar.bz2 | |
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.
Diffstat (limited to 'cpukit/score/cpu/avr')
| -rw-r--r-- | cpukit/score/cpu/avr/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/avr/rtems/score/cpu.h | 6 | ||||
| -rw-r--r-- | cpukit/score/cpu/avr/rtems/score/types.h | 11 |
3 files changed, 9 insertions, 13 deletions
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 |