* rtems/asm.h: Fixed header guard.
	* rtems/score/cpu.h: Assembler compatibility fixes.
This commit is contained in:
Sebastian Huber
2010-07-27 10:51:12 +00:00
parent 508632a675
commit 8bd26f1695
3 changed files with 14 additions and 10 deletions

View File

@@ -1,3 +1,8 @@
2010-07-27 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/asm.h: Fixed header guard.
* rtems/score/cpu.h: Assembler compatibility fixes.
2010-07-16 Sebastian Huber <sebastian.huber@embedded-brains.de> 2010-07-16 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/cpu.h: Include <rtems/score/types.h> first. * rtems/score/cpu.h: Include <rtems/score/types.h> first.

View File

@@ -95,15 +95,6 @@
#define PUBLIC(sym) .globl SYM (sym) #define PUBLIC(sym) .globl SYM (sym)
#define EXTERN(sym) .globl SYM (sym) #define EXTERN(sym) .globl SYM (sym)
#endif
/* Copyright (c) 2002, 2005, 2006, 2007 Marek Michalkiewicz /* Copyright (c) 2002, 2005, 2006, 2007 Marek Michalkiewicz
Copyright (c) 2006 Dmitry Xmelkov Copyright (c) 2006 Dmitry Xmelkov
All rights reserved. All rights reserved.
@@ -469,4 +460,4 @@
#endif #endif
.endm .endm
#endif /* _RTEMS_ASM_H */

View File

@@ -382,6 +382,8 @@ extern "C" {
/* may need to put some structures here. */ /* may need to put some structures here. */
#ifndef ASM
/* /*
* Contexts * Contexts
* *
@@ -453,6 +455,8 @@ typedef struct {
SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context; SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context;
#endif /* ASM */
/* /*
* Nothing prevents the porter from declaring more CPU specific variables. * Nothing prevents the porter from declaring more CPU specific variables.
* *
@@ -678,6 +682,8 @@ SCORE_EXTERN Context_Control_fp _CPU_Null_fp_context;
{ \ { \
} }
#ifndef ASM
uint32_t _CPU_ISR_Get_level( void ); uint32_t _CPU_ISR_Get_level( void );
/* end of ISR handler macros */ /* end of ISR handler macros */
@@ -1147,6 +1153,8 @@ static inline uint32_t CPU_swap_u32(
#define CPU_swap_u16( value ) \ #define CPU_swap_u16( value ) \
(((value&0xff) << 8) | ((value >> 8)&0xff)) (((value&0xff) << 8) | ((value >> 8)&0xff))
#endif /* ASM */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif