diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-06 15:04:57 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-06 15:04:57 +0000 |
| commit | 962865582a728742636fde5d8ef89c800f47787f (patch) | |
| tree | 2c614deb71dfee72cfb36f54e47cc7c9475ef9c7 /nuttx/arch/arm/include | |
| parent | 55540073dc3d5842e1f1e30d880682f0bb5ec11b (diff) | |
Integrate syscall with existing svcall logic
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3472 7fd9a85b-ad96-42d3-883c-3090e2eb8679
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 c81ad7aec2..e06de1a3c2 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 4c5eb65562..bf61d7ee89 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 */ |