arch: Move the content from svcall.h to syscall.h

and remove svcall.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

arch/arm/include/syscall.h

@@ -47,16 +47,98 @@
 #  define SYS_smhcall 0x123456
 #endif
 
-/* The SYS_signal_handler_return is executed here... its value is not always
+/* Configuration ************************************************************/
- * available in this context and so is assumed to be 7.
+
+/* This logic uses three system calls {0,1,2} for context switching and one
+ * for the syscall return.
+ * So a minimum of four syscall values must be reserved.
+ * If CONFIG_BUILD_PROTECTED is defined, then four more syscall values must
+ * be reserved.
  */
 
-#ifndef SYS_signal_handler_return
+#ifdef CONFIG_LIB_SYSCALL
-#  define SYS_signal_handler_return (7)
+#  ifdef CONFIG_BUILD_PROTECTED
-#elif SYS_signal_handler_return != 7
+#    ifndef CONFIG_SYS_RESERVED
-#  error "SYS_signal_handler_return was assumed to be 7"
+#      error "CONFIG_SYS_RESERVED must be defined to have the value 8"
+#    elif CONFIG_SYS_RESERVED != 8
+#      error "CONFIG_SYS_RESERVED must have the value 8"
+#    endif
+#  else
+#    ifndef CONFIG_SYS_RESERVED
+#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
+#    elif CONFIG_SYS_RESERVED != 4
+#      error "CONFIG_SYS_RESERVED must have the value 4"
+#    endif
+#  endif
 #endif
 
+/* Cortex-M system calls ****************************************************/
+
+/* SYS call 0:
+ *
+ * int arm_saveusercontext(uint32_t *saveregs);
+ */
+
+#define SYS_save_context          (0)
+
+/* SYS call 1:
+ *
+ * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ */
+
+#define SYS_restore_context       (1)
+
+/* SYS call 2:
+ *
+ * void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
+ */
+
+#define SYS_switch_context        (2)
+
+#ifdef CONFIG_LIB_SYSCALL
+/* SYS call 3:
+ *
+ * void arm_syscall_return(void);
+ */
+
+#define SYS_syscall_return        (3)
+#endif /* CONFIG_LIB_SYSCALL */
+
+#ifndef CONFIG_BUILD_FLAT
+/* SYS call 4:
+ *
+ * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
+ *        noreturn_function;
+ */
+
+#define SYS_task_start            (4)
+
+/* SYS call 5:
+ *
+ * void up_pthread_start((pthread_startroutine_t startup,
+ *                        pthread_startroutine_t entrypt, pthread_addr_t arg)
+ *        noreturn_function
+ */
+
+#define SYS_pthread_start         (5)
+
+/* SYS call 6:
+ *
+ * void signal_handler(_sa_sigaction_t sighand,
+ *                     int signo, FAR siginfo_t *info,
+ *                     FAR void *ucontext);
+ */
+
+#define SYS_signal_handler        (6)
+
+/* SYS call 7:
+ *
+ * void signal_handler_return(void);
+ */
+
+#define SYS_signal_handler_return (7)
+#endif /* !CONFIG_BUILD_FLAT */
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/

arch/arm/src/arm/arm_fullcontextrestore.S

@@ -24,8 +24,8 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
-#include "svcall.h"
 #include "arm.h"
 
 /****************************************************************************

arch/arm/src/arm/arm_syscall.c

@@ -27,12 +27,12 @@
 #include <stdint.h>
 #include <assert.h>
 #include <debug.h>
+#include <syscall.h>
 
 #include <nuttx/arch.h>
 
 #include "arm_arch.h"
 #include "arm_internal.h"
-#include "svcall.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/svcall.h

@@ -1,127 +0,0 @@
-/****************************************************************************
- * arch/arm/src/arm/svcall.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARM_SVCALL_H
-#define __ARCH_ARM_SRC_ARM_SVCALL_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <syscall.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-/* This logic uses one system call for the syscall return.  So a minimum of
- * one syscall values must be reserved.  If CONFIG_BUILD_KERNEL is defined,
- * then four more syscall values must be reserved.
- */
-
-#ifdef CONFIG_LIB_SYSCALL
-#  ifdef CONFIG_BUILD_KERNEL
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 7"
-#    elif CONFIG_SYS_RESERVED != 7
-#      error "CONFIG_SYS_RESERVED must have the value 7"
-#    endif
-#  else
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
-#    elif CONFIG_SYS_RESERVED != 4
-#      error "CONFIG_SYS_RESERVED must have the value 4"
-#    endif
-#  endif
-#endif
-
-/* Cortex-A system calls ****************************************************/
-
-/* SYS call 0:
- *
- * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
- */
-
-#define SYS_restore_context       (0)
-
-/* SYS call 1:
- *
- * void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
- */
-
-#define SYS_switch_context        (1)
-
-#ifdef CONFIG_LIB_SYSCALL
-/* SYS call 2:
- *
- * void arm_syscall_return(void);
- */
-
-#define SYS_syscall_return        (2)
-
-#ifndef CONFIG_BUILD_FLAT
-#ifdef CONFIG_BUILD_KERNEL
-/* SYS call 3:
- *
- * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
- *        noreturn_function;
- */
-
-#define SYS_task_start            (3)
-
-/* SYS call 5:
- *
- * void signal_handler(_sa_sigaction_t sighand,
- *                     int signo, FAR siginfo_t *info,
- *                     FAR void *ucontext);
- */
-
-#define SYS_signal_handler        (5)
-
-/* SYS call 6:
- *
- * void signal_handler_return(void);
- */
-
-#define SYS_signal_handler_return (6)
-
-#endif /* !CONFIG_BUILD_FLAT */
-
-/* SYS call 4:
- *
- * void up_pthread_start(pthread_startroutine_t startup,
- *                       pthread_startroutine_t entrypt, pthread_addr_t arg)
- *        noreturn_function
- */
-
-#define SYS_pthread_start         (4)
-
-#endif /* CONFIG_BUILD_KERNEL */
-#endif /* CONFIG_LIB_SYSCALL */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_ARM_SVCALL_H */

arch/arm/src/armv6-m/arm_fullcontextrestore.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv6-m/arm_saveusercontext.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv6-m/arm_signal_dispatch.c

@@ -25,7 +25,8 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "arm_internal.h"
 
 #if !defined(CONFIG_BUILD_FLAT) && defined(__KERNEL__)

arch/arm/src/armv6-m/arm_signal_handler.S

@@ -61,7 +61,7 @@
  *
  * Returned Value:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_signal_handler_return (see svcall.h)
+ *   via the SYS_signal_handler_return (see syscall.h)
  *
  ****************************************************************************/
 

arch/arm/src/armv6-m/arm_svcall.c

@@ -29,12 +29,12 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
+#include <syscall.h>
 
 #include <arch/irq.h>
 #include <nuttx/sched.h>
 
 #include "signal/signal.h"
-#include "svcall.h"
 #include "exc_return.h"
 #include "arm_internal.h"
 

arch/arm/src/armv6-m/svcall.h

@@ -1,136 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv6-m/svcall.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARMV6_M_SVCALL_H
-#define __ARCH_ARM_SRC_ARMV6_M_SVCALL_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <syscall.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-/* This logic uses three system calls {0,1,2} for context switching and one
- * for the syscall return.
- * So a minimum of four syscall values must be reserved.
- * If CONFIG_BUILD_PROTECTED is defined, then four more syscall values must
- * be reserved.
- */
-
-#ifdef CONFIG_LIB_SYSCALL
-#  ifdef CONFIG_BUILD_PROTECTED
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 8"
-#    elif CONFIG_SYS_RESERVED != 8
-#      error "CONFIG_SYS_RESERVED must have the value 8"
-#    endif
-#  else
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
-#    elif CONFIG_SYS_RESERVED != 4
-#      error "CONFIG_SYS_RESERVED must have the value 4"
-#    endif
-#  endif
-#endif
-
-/* Cortex M0 system calls ***************************************************/
-
-/* SYS call 0:
- *
- * int arm_saveusercontext(uint32_t *saveregs);
- */
-
-#define SYS_save_context          (0)
-
-/* SYS call 1:
- *
- * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
- */
-
-#define SYS_restore_context       (1)
-
-/* SYS call 2:
- *
- * void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
- */
-
-#define SYS_switch_context        (2)
-
-#ifdef CONFIG_LIB_SYSCALL
-/* SYS call 3:
- *
- * void arm_syscall_return(void);
- */
-
-#define SYS_syscall_return        (3)
-
-#ifndef CONFIG_BUILD_FLAT
-#ifdef CONFIG_BUILD_PROTECTED
-/* SYS call 4:
- *
- * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
- *        noreturn_function;
- */
-
-#define SYS_task_start            (4)
-
-/* SYS call 6:
- *
- * void signal_handler(_sa_sigaction_t sighand, int signo,
- *                     FAR siginfo_t *info,
- *                     FAR void *ucontext);
- */
-
-#define SYS_signal_handler        (6)
-
-/* SYS call 7:
- *
- * void signal_handler_return(void);
- */
-
-#define SYS_signal_handler_return (7)
-
-#endif /* CONFIG_BUILD_PROTECTED */
-
-/* SYS call 5:
- *
- * void up_pthread_start(pthread_startroutine_t startup,
- *                       pthread_startroutine_t entrypt, pthread_addr_t arg)
- *        noreturn_function
- */
-
-#define SYS_pthread_start         (5)
-
-#endif /* !CONFIG_BUILD_FLAT */
-#endif /* CONFIG_LIB_SYSCALL */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_ARMV6_M_SVCALL_H */

arch/arm/src/armv7-a/arm_fullcontextrestore.S

@@ -24,8 +24,8 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
-#include "svcall.h"
 #include "arm.h"
 
 /****************************************************************************

arch/arm/src/armv7-a/arm_signal_dispatch.c

@@ -25,7 +25,8 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "pgalloc.h"
 #include "arm_internal.h"
 

arch/arm/src/armv7-a/arm_syscall.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
+#include <syscall.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
@@ -36,7 +37,6 @@
 
 #include "signal/signal.h"
 #include "arm.h"
-#include "svcall.h"
 #include "addrenv.h"
 #include "arm_internal.h"
 

arch/arm/src/armv7-a/crt0.c

@@ -29,7 +29,7 @@
 
 #include <nuttx/addrenv.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 #ifdef CONFIG_BUILD_KERNEL
 
@@ -62,7 +62,7 @@ int main(int argc, char *argv[]);
  *
  * Returned Value:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_signal_handler_return (see svcall.h)
+ *   via the SYS_signal_handler_return (see syscall.h)
  *
  ****************************************************************************/
 

arch/arm/src/armv7-a/svcall.h

@@ -1,127 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv7-a/svcall.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARMV7_A_SVCALL_H
-#define __ARCH_ARM_SRC_ARMV7_A_SVCALL_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <syscall.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-/* This logic uses one system call for the syscall return.  So a minimum of
- * one syscall values must be reserved.  If CONFIG_BUILD_KERNEL is defined,
- * then four more syscall values must be reserved.
- */
-
-#ifdef CONFIG_LIB_SYSCALL
-#  ifdef CONFIG_BUILD_KERNEL
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 7"
-#    elif CONFIG_SYS_RESERVED != 7
-#      error "CONFIG_SYS_RESERVED must have the value 7"
-#    endif
-#  else
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
-#    elif CONFIG_SYS_RESERVED != 4
-#      error "CONFIG_SYS_RESERVED must have the value 4"
-#    endif
-#  endif
-#endif
-
-/* Cortex-A system calls ****************************************************/
-
-/* SYS call 0:
- *
- * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
- */
-
-#define SYS_restore_context       (0)
-
-/* SYS call 1:
- *
- * void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
- */
-
-#define SYS_switch_context        (1)
-
-#ifdef CONFIG_LIB_SYSCALL
-/* SYS call 2:
- *
- * void arm_syscall_return(void);
- */
-
-#define SYS_syscall_return        (2)
-
-#ifndef CONFIG_BUILD_FLAT
-#ifdef CONFIG_BUILD_KERNEL
-/* SYS call 3:
- *
- * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
- *        noreturn_function;
- */
-
-#define SYS_task_start            (3)
-
-/* SYS call 5:
- *
- * void signal_handler(_sa_sigaction_t sighand,
- *                     int signo, FAR siginfo_t *info,
- *                     FAR void *ucontext);
- */
-
-#define SYS_signal_handler        (5)
-
-/* SYS call 6:
- *
- * void signal_handler_return(void);
- */
-
-#define SYS_signal_handler_return (6)
-
-#endif /* !CONFIG_BUILD_FLAT */
-
-/* SYS call 4:
- *
- * void up_pthread_start(pthread_startroutine_t startup,
- *                       pthread_startroutine_t entrypt, pthread_addr_t arg)
- *        noreturn_function
- */
-
-#define SYS_pthread_start         (4)
-
-#endif /* CONFIG_BUILD_KERNEL */
-#endif /* CONFIG_LIB_SYSCALL */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_ARMV7_A_SVCALL_H */

arch/arm/src/armv7-m/arm_signal_dispatch.c

@@ -25,7 +25,8 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "arm_internal.h"
 
 #if !defined(CONFIG_BUILD_FLAT) && defined(__KERNEL__)

arch/arm/src/armv7-m/arm_svcall.c

@@ -29,13 +29,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
+#include <syscall.h>
 
 #include <arch/irq.h>
 #include <nuttx/sched.h>
 #include <nuttx/userspace.h>
 
 #include "signal/signal.h"
-#include "svcall.h"
 #include "exc_return.h"
 #include "arm_internal.h"
 

arch/arm/src/armv7-m/gnu/arm_fullcontextrestore.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv7-m/gnu/arm_saveusercontext.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv7-m/gnu/arm_signal_handler.S

@@ -63,7 +63,7 @@
  *
  * Returned Value:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_signal_handler_return (see svcall.h)
+ *   via the SYS_signal_handler_return (see syscall.h)
  *
  ****************************************************************************/
 

arch/arm/src/armv7-m/iar/arm_fullcontextrestore.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 	MODULE arm_fullcontextrestore
 	SECTION .text:CODE:NOROOT(2)

arch/arm/src/armv7-m/iar/arm_saveusercontext.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 	MODULE arm_saveusercontext
 	SECTION .text:CODE:NOROOT(2)

arch/arm/src/armv7-m/svcall.h

@@ -1,136 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv7-m/svcall.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARMV7_M_SVCALL_H
-#define __ARCH_ARM_SRC_ARMV7_M_SVCALL_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <syscall.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-/* This logic uses three system calls {0,1,2} for context switching and one
- * for the syscall return.
- * So a minimum of four syscall values must be reserved.
- * If CONFIG_BUILD_PROTECTED is defined, then four more syscall values must
- * be reserved.
- */
-
-#ifdef CONFIG_LIB_SYSCALL
-#  ifdef CONFIG_BUILD_PROTECTED
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 8"
-#    elif CONFIG_SYS_RESERVED != 8
-#      error "CONFIG_SYS_RESERVED must have the value 8"
-#    endif
-#  else
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
-#    elif CONFIG_SYS_RESERVED != 4
-#      error "CONFIG_SYS_RESERVED must have the value 4"
-#    endif
-#  endif
-#endif
-
-/* Cortex-M system calls ****************************************************/
-
-/* SYS call 0:
- *
- * int arm_saveusercontext(uint32_t *saveregs);
- */
-
-#define SYS_save_context          (0)
-
-/* SYS call 1:
- *
- * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
- */
-
-#define SYS_restore_context       (1)
-
-/* SYS call 2:
- *
- * void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
- */
-
-#define SYS_switch_context        (2)
-
-#ifndef CONFIG_BUILD_FLAT
-#ifdef CONFIG_LIB_SYSCALL
-/* SYS call 3:
- *
- * void arm_syscall_return(void);
- */
-
-#define SYS_syscall_return        (3)
-
-#ifdef CONFIG_BUILD_PROTECTED
-/* SYS call 4:
- *
- * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
- *        noreturn_function;
- */
-
-#define SYS_task_start            (4)
-
-/* SYS call 6:
- *
- * void signal_handler(_sa_sigaction_t sighand,
- *                     int signo, FAR siginfo_t *info,
- *                     FAR void *ucontext);
- */
-
-#define SYS_signal_handler        (6)
-
-/* SYS call 7:
- *
- * void signal_handler_return(void);
- */
-
-#define SYS_signal_handler_return (7)
-
-#endif /* CONFIG_BUILD_PROTECTED */
-
-/* SYS call 5:
- *
- * void up_pthread_start((pthread_startroutine_t startup,
- *                        pthread_startroutine_t entrypt, pthread_addr_t arg)
- *        noreturn_function
- */
-
-#define SYS_pthread_start         (5)
-
-#endif /* !CONFIG_BUILD_FLAT */
-#endif /* CONFIG_LIB_SYSCALL */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_ARMV7_M_SVCALL_H */

arch/arm/src/armv7-r/arm_fullcontextrestore.S

@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
-
+#include <arch/syscall.h>
-#include "svcall.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv7-r/arm_signal_dispatch.c

@@ -25,7 +25,8 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "pgalloc.h"
 #include "arm_internal.h"
 

arch/arm/src/armv7-r/arm_signal_handler.S

@@ -61,7 +61,7 @@
  *
  * Returned Value:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_signal_handler_return (see svcall.h)
+ *   via the SYS_signal_handler_return (see syscall.h)
  *
  ****************************************************************************/
 

arch/arm/src/armv7-r/arm_syscall.c

@@ -28,13 +28,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
+#include <syscall.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
 #include "signal/signal.h"
 #include "arm.h"
-#include "svcall.h"
 #include "arm_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-r/svcall.h

@@ -1,128 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv7-r/svcall.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARMV7_R_SVCALL_H
-#define __ARCH_ARM_SRC_ARMV7_R_SVCALL_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <syscall.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-/* This logic uses one system call for the syscall return.
- *  So a minimum of one syscall values must be reserved.
- * If CONFIG_BUILD_PROTECTED is defined, then four
- * more syscall values must be reserved.
- */
-
-#ifdef CONFIG_LIB_SYSCALL
-#  ifdef CONFIG_BUILD_KERNEL
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 7"
-#    elif CONFIG_SYS_RESERVED != 7
-#      error "CONFIG_SYS_RESERVED must have the value 7"
-#    endif
-#  else
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
-#    elif CONFIG_SYS_RESERVED != 4
-#      error "CONFIG_SYS_RESERVED must have the value 4"
-#    endif
-#  endif
-#endif
-
-/* Cortex-R system calls ****************************************************/
-
-/* SYS call 0:
- *
- * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
- */
-
-#define SYS_restore_context       (0)
-
-/* SYS call 1:
- *
- * void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
- */
-
-#define SYS_switch_context        (1)
-
-#ifdef CONFIG_LIB_SYSCALL
-/* SYS call 2:
- *
- * void arm_syscall_return(void);
- */
-
-#define SYS_syscall_return        (2)
-
-#ifndef CONFIG_BUILD_FLAT
-#ifdef CONFIG_BUILD_KERNEL
-/* SYS call 3:
- *
- * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
- *        noreturn_function;
- */
-
-#define SYS_task_start            (3)
-
-/* SYS call 5:
- *
- * void signal_handler(_sa_sigaction_t sighand,
- *                     int signo, FAR siginfo_t *info,
- *                     FAR void *ucontext);
- */
-
-#define SYS_signal_handler        (5)
-
-/* SYS call 6:
- *
- * void signal_handler_return(void);
- */
-
-#define SYS_signal_handler_return (6)
-
-#endif /* !CONFIG_BUILD_FLAT */
-
-/* SYS call 4:
- *
- * void up_pthread_start(pthread_startroutine_t startup,
- *                       pthread_startroutine_t entrypt, pthread_addr_t arg)
- *        noreturn_function
- */
-
-#define SYS_pthread_start         (4)
-
-#endif /* !CONFIG_BUILD_FLAT */
-#endif /* CONFIG_LIB_SYSCALL */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_ARMV7_R_SVCALL_H */

arch/arm/src/armv8-m/arm_fullcontextrestore.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv8-m/arm_saveusercontext.S

@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
+#include <arch/syscall.h>
 
 #include "nvic.h"
-#include "svcall.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv8-m/arm_signal_dispatch.c

@@ -25,7 +25,8 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "arm_internal.h"
 
 #if !defined(CONFIG_BUILD_FLAT) && defined(__KERNEL__)

arch/arm/src/armv8-m/arm_signal_handler.S

@@ -63,7 +63,7 @@
  *
  * Returned Value:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_signal_handler_return (see svcall.h)
+ *   via the SYS_signal_handler_return (see syscall.h)
  *
  ****************************************************************************/
 

arch/arm/src/armv8-m/arm_svcall.c

@@ -28,13 +28,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
+#include <syscall.h>
 
 #include <arch/irq.h>
 #include <nuttx/sched.h>
 #include <nuttx/userspace.h>
 
 #include "signal/signal.h"
-#include "svcall.h"
 #include "exc_return.h"
 #include "arm_internal.h"
 

arch/arm/src/armv8-m/svcall.h

@@ -1,135 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv8-m/svcall.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARMV8_M_SVCALL_H
-#define __ARCH_ARM_SRC_ARMV8_M_SVCALL_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <syscall.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-/* This logic uses three system calls {0,1,2} for context switching and one
- * for the syscall return.  So a minimum of four syscall values must be
- *reserved.  If CONFIG_BUILD_PROTECTED is defined, then four more syscall
- * values must be reserved.
- */
-
-#ifdef CONFIG_LIB_SYSCALL
-#  ifdef CONFIG_BUILD_PROTECTED
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 8"
-#    elif CONFIG_SYS_RESERVED != 8
-#      error "CONFIG_SYS_RESERVED must have the value 8"
-#    endif
-#  else
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
-#    elif CONFIG_SYS_RESERVED != 4
-#      error "CONFIG_SYS_RESERVED must have the value 4"
-#    endif
-#  endif
-#endif
-
-/* Cortex-M system calls ****************************************************/
-
-/* SYS call 0:
- *
- * int arm_saveusercontext(uint32_t *saveregs);
- */
-
-#define SYS_save_context          (0)
-
-/* SYS call 1:
- *
- * void arm_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
- */
-
-#define SYS_restore_context       (1)
-
-/* SYS call 2:
- *
- * void arm_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
- */
-
-#define SYS_switch_context        (2)
-
-#ifdef CONFIG_LIB_SYSCALL
-/* SYS call 3:
- *
- * void arm_syscall_return(void);
- */
-
-#define SYS_syscall_return        (3)
-
-#ifndef CONFIG_BUILD_FLAT
-#ifdef CONFIG_BUILD_PROTECTED
-/* SYS call 4:
- *
- * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
- *        noreturn_function;
- */
-
-#define SYS_task_start            (4)
-
-/* SYS call 6:
- *
- * void signal_handler(_sa_sigaction_t sighand,
- *                     int signo, FAR siginfo_t *info,
- *                     FAR void *ucontext);
- */
-
-#define SYS_signal_handler        (6)
-
-/* SYS call 7:
- *
- * void signal_handler_return(void);
- */
-
-#define SYS_signal_handler_return (7)
-
-#endif /* CONFIG_BUILD_PROTECTED */
-
-/* SYS call 5:
- *
- * void up_pthread_start(pthread_startroutine_t startup,
- *                       pthread_startroutine_t entrypt, pthread_addr_t arg)
- *        noreturn_function
- */
-
-#define SYS_pthread_start         (5)
-
-#endif /* !CONFIG_BUILD_FLAT */
-#endif /* CONFIG_LIB_SYSCALL */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_ARMV8_M_SVCALL_H */

arch/arm/src/common/arm_pthread_start.c

@@ -28,7 +28,8 @@
 
 #include <assert.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "arm_internal.h"
 
 #if !defined(CONFIG_BUILD_FLAT) && defined(__KERNEL__) && \

arch/arm/src/common/arm_switchcontext.c

@@ -24,8 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
-#include "syscall.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/common/arm_task_start.c

@@ -27,7 +27,8 @@
 
 #include <assert.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "arm_internal.h"
 
 #ifndef CONFIG_BUILD_FLAT

arch/ceva/include/syscall.h

@@ -39,6 +39,96 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* Configuration ************************************************************/
+
+/* This logic uses three system calls {0,1,2} for context switching and one
+ * for the syscall return.
+ * So a minimum of four syscall values must be reserved.
+ * If CONFIG_BUILD_PROTECTED is defined, then four more syscall values
+ * must be reserved.
+ */
+
+#ifdef CONFIG_LIB_SYSCALL
+#  ifdef CONFIG_BUILD_PROTECTED
+#    ifndef CONFIG_SYS_RESERVED
+#      error "CONFIG_SYS_RESERVED must be defined to have the value 8"
+#    elif CONFIG_SYS_RESERVED != 8
+#      error "CONFIG_SYS_RESERVED must have the value 8"
+#    endif
+#  else
+#    ifndef CONFIG_SYS_RESERVED
+#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
+#    elif CONFIG_SYS_RESERVED != 4
+#      error "CONFIG_SYS_RESERVED must have the value 4"
+#    endif
+#  endif
+#endif
+
+/* CEVA system calls ********************************************************/
+
+/* SYS call 0:
+ *
+ * int up_saveusercontext(uint32_t *saveregs);
+ */
+
+#define SYS_save_context          0x00
+
+/* SYS call 1:
+ *
+ * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+ */
+
+#define SYS_restore_context       0x01
+
+/* SYS call 2:
+ *
+ * void up_switchcontext(uint32_t **saveregs, uint32_t *restoreregs);
+ */
+
+#define SYS_switch_context        0x02
+
+#ifdef CONFIG_LIB_SYSCALL
+/* SYS call 3:
+ *
+ * void up_syscall_return(void);
+ */
+
+#define SYS_syscall_return        0x03
+#endif /* CONFIG_LIB_SYSCALL */
+
+#ifndef CONFIG_BUILD_FLAT
+/* SYS call 4:
+ *
+ * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
+ *        noreturn_function;
+ */
+
+#define SYS_task_start            0x04
+
+/* SYS call 5:
+ *
+ * void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg)
+ *        noreturn_function
+ */
+
+#define SYS_pthread_start         0x05
+
+/* SYS call 6:
+ *
+ * void signal_handler(_sa_sigaction_t sighand, int signo,
+ *                     FAR siginfo_t *info, FAR void *ucontext);
+ */
+
+#define SYS_signal_handler        0x06
+
+/* SYS call 7:
+ *
+ * void signal_handler_return(void);
+ */
+
+#define SYS_signal_handler_return 0x07
+#endif /* !CONFIG_BUILD_FLAT */
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/

arch/ceva/src/common/svcall.h

@@ -1,130 +0,0 @@
-/****************************************************************************
- * arch/ceva/src/common/svcall.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_CEVA_SRC_COMMON_SVCALL_H
-#define __ARCH_CEVA_SRC_COMMON_SVCALL_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <syscall.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* Configuration ************************************************************/
-
-/* This logic uses three system calls {0,1,2} for context switching and one
- * for the syscall return.
- * So a minimum of four syscall values must be reserved.
- * If CONFIG_BUILD_PROTECTED is defined, then four more syscall values
- * must be reserved.
- */
-
-#ifdef CONFIG_LIB_SYSCALL
-#  ifdef CONFIG_BUILD_PROTECTED
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 8"
-#    elif CONFIG_SYS_RESERVED != 8
-#      error "CONFIG_SYS_RESERVED must have the value 8"
-#    endif
-#  else
-#    ifndef CONFIG_SYS_RESERVED
-#      error "CONFIG_SYS_RESERVED must be defined to have the value 4"
-#    elif CONFIG_SYS_RESERVED != 4
-#      error "CONFIG_SYS_RESERVED must have the value 4"
-#    endif
-#  endif
-#endif
-
-/* CEVA system calls ********************************************************/
-
-/* SYS call 0:
- *
- * int up_saveusercontext(uint32_t *saveregs);
- */
-
-#define SYS_save_context          0x00
-
-/* SYS call 1:
- *
- * void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
- */
-
-#define SYS_restore_context       0x01
-
-/* SYS call 2:
- *
- * void up_switchcontext(uint32_t **saveregs, uint32_t *restoreregs);
- */
-
-#define SYS_switch_context        0x02
-
-#ifdef CONFIG_LIB_SYSCALL
-/* SYS call 3:
- *
- * void up_syscall_return(void);
- */
-
-#define SYS_syscall_return        0x03
-
-#ifdef CONFIG_BUILD_PROTECTED
-/* SYS call 4:
- *
- * void up_task_start(main_t taskentry, int argc, FAR char *argv[])
- *        noreturn_function;
- */
-
-#define SYS_task_start            0x04
-
-/* SYS call 5:
- *
- * void up_pthread_start(pthread_startroutine_t entrypt, pthread_addr_t arg)
- *        noreturn_function
- */
-
-#define SYS_pthread_start         0x05
-
-/* SYS call 6:
- *
- * void signal_handler(_sa_sigaction_t sighand, int signo,
- *                     FAR siginfo_t *info, FAR void *ucontext);
- */
-
-#define SYS_signal_handler        0x06
-
-/* SYS call 7:
- *
- * void signal_handler_return(void);
- */
-
-#define SYS_signal_handler_return 0x07
-
-#endif /* CONFIG_BUILD_PROTECTED */
-#endif /* CONFIG_LIB_SYSCALL */
-
-/****************************************************************************
- * Inline Functions
- ****************************************************************************/
-
-#endif /* __ARCH_CEVA_SRC_COMMON_SVCALL_H */

arch/ceva/src/common/up_fullcontextrestore.c

@@ -22,7 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/ceva/src/common/up_pthread_start.c

@@ -26,7 +26,7 @@
 #include <pthread.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 #if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
       defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_PTHREAD)

arch/ceva/src/common/up_saveusercontext.c

@@ -25,7 +25,8 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/ceva/src/common/up_signal_dispatch.c

@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 #if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
       defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_SIGNALS)

arch/ceva/src/common/up_svcall.c

@@ -27,12 +27,12 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
+#include <syscall.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/sched.h>
 #include <nuttx/userspace.h>
 
-#include "svcall.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/ceva/src/common/up_switchcontext.c

@@ -22,7 +22,8 @@
  * Included Files
  ****************************************************************************/
 
-#include "svcall.h"
+#include <arch/syscall.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/ceva/src/common/up_task_start.c

@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 #if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
 

arch/ceva/src/xc5/up_signal_handler.S

@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 #if (defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)) && \
     !defined(CONFIG_DISABLE_SIGNALS)
@@ -54,7 +54,7 @@
  *
  * Returned Value:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_signal_handler_return (see svcall.h)
+ *   via the SYS_signal_handler_return (see syscall.h)
  *
  ****************************************************************************/
 

arch/ceva/src/xc5/up_svcall_handler.S

@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 #ifdef CONFIG_LIB_SYSCALL
 
@@ -59,7 +59,7 @@
  *
  * Returned Value:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_syscall_return (see svcall.h)
+ *   via the SYS_syscall_return (see syscall.h)
  *
  ****************************************************************************/
 

arch/ceva/src/xc5/vfork.S

@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 /****************************************************************************
  * Public Symbols

arch/ceva/src/xm6/up_signal_handler.S

@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include "svcall.h"
+#include <arch/syscall.h>
 
 #if (defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)) && \
     !defined(CONFIG_DISABLE_SIGNALS)
@@ -54,7 +54,7 @@
  *
  * Return:
  *   None.  This function does not return in the normal sense.  It returns
- *   via the SYS_signal_handler_return (see svcall.h)
+ *   via the SYS_signal_handler_return (see syscall.h)
  *
  ****************************************************************************/