diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-06 15:04:57 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-06 15:04:57 +0000 |
commit | e888bb3a55e974475a87fee0371f4405ddab696e (patch) | |
tree | 2c614deb71dfee72cfb36f54e47cc7c9475ef9c7 /nuttx/arch/arm/include | |
parent | 767a6400de3f6e709a6a453ea3c90422a316a598 (diff) | |
download | px4-nuttx-e888bb3a55e974475a87fee0371f4405ddab696e.tar.gz px4-nuttx-e888bb3a55e974475a87fee0371f4405ddab696e.tar.bz2 px4-nuttx-e888bb3a55e974475a87fee0371f4405ddab696e.zip |
Integrate syscall with existing svcall logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3472 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/include')
-rw-r--r-- | nuttx/arch/arm/include/arm/syscall.h | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/include/cortexm3/syscall.h | 12 |
2 files changed, 15 insertions, 7 deletions
diff --git a/nuttx/arch/arm/include/arm/syscall.h b/nuttx/arch/arm/include/arm/syscall.h index c81ad7aec..e06de1a3c 100644 --- a/nuttx/arch/arm/include/arm/syscall.h +++ b/nuttx/arch/arm/include/arm/syscall.h @@ -45,7 +45,10 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <stdint.h> + +#ifndef __ASSEMBLY__ +# include <stdint.h> +#endif /**************************************************************************** * Pre-Processor Definitions @@ -61,6 +64,8 @@ * Inline functions ****************************************************************************/ +#ifndef __ASSEMBLY__ + /* SWI with SYS_ call number and no parameters */ static inline uintptr_t sys_call0(unsigned int nbr) @@ -221,7 +226,6 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1, * Public Function Prototypes ****************************************************************************/ -#ifndef __ASSEMBLY__ #ifdef __cplusplus #define EXTERN extern "C" extern "C" { @@ -233,7 +237,7 @@ extern "C" { #ifdef __cplusplus } #endif -#endif +#endif /* __ASSEMBLY__ */ #endif /* __ARCH_ARM_INCLUDE_ARM_SYSCALL_H */ diff --git a/nuttx/arch/arm/include/cortexm3/syscall.h b/nuttx/arch/arm/include/cortexm3/syscall.h index 4c5eb6556..bf61d7ee8 100644 --- a/nuttx/arch/arm/include/cortexm3/syscall.h +++ b/nuttx/arch/arm/include/cortexm3/syscall.h @@ -44,8 +44,11 @@ * Included Files ****************************************************************************/ - #include <nuttx/config.h> -#include <stdint.h> +#include <nuttx/config.h> + +#ifndef __ASSEMBLY__ +# include <stdint.h> +#endif /**************************************************************************** * Pro-processor Definitions @@ -61,6 +64,8 @@ * Inline functions ****************************************************************************/ +#ifndef __ASSEMBLY__ + /* SVC call with SYS_ call number and no parameters */ static inline uintptr_t sys_call0(unsigned int nbr) @@ -221,7 +226,6 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1, * Public Function Prototypes ****************************************************************************/ -#ifndef __ASSEMBLY__ #ifdef __cplusplus #define EXTERN extern "C" extern "C" { @@ -233,7 +237,7 @@ extern "C" { #ifdef __cplusplus } #endif -#endif +#endif /* __ASSEMBLY__ */ #endif /* __ARCH_ARM_INCLUDE_CORTEXM3_SYSCALL_H */ |