From 3ffc8871de7970a40df0ef7073bb1529b72809d2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 29 Aug 2014 07:48:16 -0600
Subject: [PATCH] Rename  arch/arm/src/armv7-a/syscall.h to svcall.h to work
 around some include path name collisions; fix some compilation errors in
 SYSCALL logic when debug is enabled

---
 arch/arm/src/armv6-m/svcall.h                |  6 +++---
 arch/arm/src/armv7-a/arm_syscall.c           | 19 ++++++++++++-------
 arch/arm/src/armv7-a/{syscall.h => svcall.h} |  8 ++++----
 arch/arm/src/armv7-m/svcall.h                |  6 +++---
 4 files changed, 22 insertions(+), 17 deletions(-)
 rename arch/arm/src/armv7-a/{syscall.h => svcall.h} (95%)

diff --git a/arch/arm/src/armv6-m/svcall.h b/arch/arm/src/armv6-m/svcall.h
index 8afd1a981b..0aaf9b7010 100644
--- a/arch/arm/src/armv6-m/svcall.h
+++ b/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/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index f030205b34..4f8d648018 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/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/arch/arm/src/armv7-a/syscall.h b/arch/arm/src/armv7-a/svcall.h
similarity index 95%
rename from arch/arm/src/armv7-a/syscall.h
rename to arch/arm/src/armv7-a/svcall.h
index 8f83a93c2a..90a25fb2cf 100644
--- a/arch/arm/src/armv7-a/syscall.h
+++ b/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/arch/arm/src/armv7-m/svcall.h b/arch/arm/src/armv7-m/svcall.h
index 8d3a19ed07..dd4ef8d6c2 100644
--- a/arch/arm/src/armv7-m/svcall.h
+++ b/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 */