diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-07-27 10:57:31 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2010-07-27 10:57:31 +0000 |
| commit | 6ff192539376786c5e7b857e305c71d25646c839 (patch) | |
| tree | 36e6af0a9794c6c941d8bd1be7b1f186c1200edd /cpukit | |
| parent | 2010-07-27 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-6ff192539376786c5e7b857e305c71d25646c839.tar.bz2 | |
2010-07-27 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/cpu.h: Assembler compatibility fixes.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/score/cpu/bfin/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/score/cpu/bfin/rtems/score/cpu.h | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cpukit/score/cpu/bfin/ChangeLog b/cpukit/score/cpu/bfin/ChangeLog index d08d3b3744..b07bfecb22 100644 --- a/cpukit/score/cpu/bfin/ChangeLog +++ b/cpukit/score/cpu/bfin/ChangeLog @@ -1,3 +1,7 @@ +2010-07-27 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * rtems/score/cpu.h: Assembler compatibility fixes. + 2010-07-16 Sebastian Huber <sebastian.huber@embedded-brains.de> * rtems/score/cpu.h: Include <rtems/score/types.h> first. diff --git a/cpukit/score/cpu/bfin/rtems/score/cpu.h b/cpukit/score/cpu/bfin/rtems/score/cpu.h index a6b73e1b57..d1b6b7f29b 100644 --- a/cpukit/score/cpu/bfin/rtems/score/cpu.h +++ b/cpukit/score/cpu/bfin/rtems/score/cpu.h @@ -458,6 +458,8 @@ extern "C" { * XXX document implementation including references if appropriate */ +#ifndef ASM + /** * @ingroup CPUContext Management * This defines the minimal set of integer and processor state registers @@ -565,6 +567,8 @@ SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context; */ #define CPU_CONTEXT_FP_SIZE sizeof( Context_Control_fp ) +#endif /* ASM */ + /** * Amount of extra stack (above minimum stack size) required by * MPCI receive server thread. Remember that in a multiprocessor @@ -766,6 +770,7 @@ SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context; __asm__ __volatile__ ( "sti %0; csync" : : "d"(_new_level ? 0 : 0xffff) ); \ } +#ifndef ASM /** * @ingroup CPUInterrupt @@ -1250,6 +1255,8 @@ static inline uint32_t CPU_swap_u32( #define CPU_swap_u16( value ) \ (((value&0xff) << 8) | ((value >> 8)&0xff)) +#endif /* ASM */ + #ifdef __cplusplus } #endif |