diff options
-rw-r--r-- | nuttx/arch/arm/src/armv6-m/svcall.h | 6 | ||||
-rw-r--r-- | nuttx/arch/arm/src/armv7-a/arm_syscall.c | 19 | ||||
-rw-r--r-- | nuttx/arch/arm/src/armv7-a/svcall.h (renamed from nuttx/arch/arm/src/armv7-a/syscall.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/armv7-m/svcall.h | 6 |
4 files changed, 22 insertions, 17 deletions
diff --git a/nuttx/arch/arm/src/armv6-m/svcall.h b/nuttx/arch/arm/src/armv6-m/svcall.h index 8afd1a981..0aaf9b701 100644 --- a/nuttx/arch/arm/src/armv6-m/svcall.h +++ b/nuttx/arch/arm/src/armv6-m/svcall.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H -#define __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H +#ifndef __ARCH_ARM_SRC_ARMV6_M_SVCALL_H +#define __ARCH_ARM_SRC_ARMV6_M_SVCALL_H /************************************************************************************ * Included Files @@ -142,5 +142,5 @@ * Inline Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H */ +#endif /* __ARCH_ARM_SRC_ARMV6_M_SVCALL_H */ diff --git a/nuttx/arch/arm/src/armv7-a/arm_syscall.c b/nuttx/arch/arm/src/armv7-a/arm_syscall.c index f030205b3..4f8d64801 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_syscall.c +++ b/nuttx/arch/arm/src/armv7-a/arm_syscall.c @@ -36,31 +36,36 @@ /**************************************************************************** * Included Files ****************************************************************************/ + #include <nuttx/config.h> #include <stdint.h> #include <string.h> +#include <syscall.h> #include <assert.h> #include <debug.h> #include <arch/irq.h> #include <nuttx/sched.h> -#ifdef CONFIG_LIB_SYSCALL -# include <syscall.h> -#endif - -#include "syscall.h" +#include "svcall.h" #include "up_internal.h" /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ +/* Debug ********************************************************************/ /* Output debug info if stack dump is selected -- even if * debug is not selected. */ +#if defined(CONFIG_DEBUG_SYSCALL) || defined(CONFIG_DEBUG_SVCALL) +# define svcdbg(format, ...) lldbg(format, ##__VA_ARGS__) +#else +# define svcdbg(x...) +#endif + #ifdef CONFIG_ARCH_STACKDUMP # undef lldbg # define lldbg lowsyslog @@ -391,7 +396,7 @@ uint32_t *arm_syscall(uint32_t *regs) regs[REG_R0] -= CONFIG_SYS_RESERVED; #else - slldbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]); + svcdbg("ERROR: Bad SYS call: %d\n", regs[REG_R0]); #endif } break; @@ -428,7 +433,7 @@ uint32_t *arm_syscall(uint32_t *regs) uint32_t *arm_syscall(uint32_t *regs) { - lldbg("Syscall from 0x%x\n", regs[REG_PC]); + lldbg("SYSCALL from 0x%x\n", regs[REG_PC]); current_regs = regs; PANIC(); } diff --git a/nuttx/arch/arm/src/armv7-a/syscall.h b/nuttx/arch/arm/src/armv7-a/svcall.h index 8f83a93c2..90a25fb2c 100644 --- a/nuttx/arch/arm/src/armv7-a/syscall.h +++ b/nuttx/arch/arm/src/armv7-a/svcall.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/armv7-a/syscall.h + * arch/arm/src/armv7-a/svcall.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H -#define __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H +#ifndef __ARCH_ARM_SRC_ARMV7_A_SVCALL_H +#define __ARCH_ARM_SRC_ARMV7_A_SVCALL_H /************************************************************************************ * Included Files @@ -120,4 +120,4 @@ ************************************************************************************/ #endif /* CONFIG_LIB_SYSCALL */ -#endif /* __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H */ +#endif /* __ARCH_ARM_SRC_ARMV7_A_SVCALL_H */ diff --git a/nuttx/arch/arm/src/armv7-m/svcall.h b/nuttx/arch/arm/src/armv7-m/svcall.h index 8d3a19ed0..dd4ef8d6c 100644 --- a/nuttx/arch/arm/src/armv7-m/svcall.h +++ b/nuttx/arch/arm/src/armv7-m/svcall.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H -#define __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H +#ifndef __ARCH_ARM_SRC_ARMV7_M_SVCALL_H +#define __ARCH_ARM_SRC_ARMV7_M_SVCALL_H /************************************************************************************ * Included Files @@ -142,5 +142,5 @@ * Inline Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_COMMON_CORTEXM_SVCALL_H */ +#endif /* __ARCH_ARM_SRC_ARMV7_M_SVCALL_H */ |