summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-16 13:36:51 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-16 13:36:51 -0600
commit7041db91a5b7293ca331a1db7f37493f510ade89 (patch)
tree043c54fc6c230c16d4429ef5862c6ae66858e1b2
parentb94f69b5c0cc95fe016fa319b4f6ae7373b20721 (diff)
downloadpx4-nuttx-7041db91a5b7293ca331a1db7f37493f510ade89.tar.gz
px4-nuttx-7041db91a5b7293ca331a1db7f37493f510ade89.tar.bz2
px4-nuttx-7041db91a5b7293ca331a1db7f37493f510ade89.zip
These files were deleted and moved to a different location (see previos commit)
-rw-r--r--nuttx/arch/arm/src/armv7-a/pginline.h119
-rw-r--r--nuttx/arch/arm/src/common/up_signal_dispatch.c103
2 files changed, 0 insertions, 222 deletions
diff --git a/nuttx/arch/arm/src/armv7-a/pginline.h b/nuttx/arch/arm/src/armv7-a/pginline.h
deleted file mode 100644
index bc703f572..000000000
--- a/nuttx/arch/arm/src/armv7-a/pginline.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
- * arch/arm/src/armv7/pginline.h
- *
- * Copyright (C) 2014 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARMV7_A_PGINLINE_H
-#define __ARCH_ARM_SRC_ARMV7_A_PGINLINE_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdint.h>
-
-#include <nuttx/addrenv.h>
-
-#include "mmu.h"
-
-#if defined(CONFIG_MM_PGALLOC) && defined(CONFIG_ARCH_USE_MMU)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: arm_pgmap
- *
- * Description:
- * Map one page to a temporary, scratch virtual memory address
- *
- ****************************************************************************/
-
-#ifndef CONFIG_ARCH_PGPOOL_MAPPING
-static inline uintptr_t arm_tmpmap(uintptr_t paddr, FAR uint32_t *l1save)
-{
- *l1save = mmu_l1_getentry(ARCH_SCRATCH_VBASE);
- mmu_l1_setentry(paddr & ~SECTION_MASK, ARCH_SCRATCH_VBASE, MMU_MEMFLAGS);
- return ((uintptr_t)ARCH_SCRATCH_VBASE | (paddr & SECTION_MASK));
-}
-#endif
-
-/****************************************************************************
- * Name: arm_pgrestore
- *
- * Description:
- * Restore any previous L1 page table mapping that was in place when
- * arm_tmpmap() was called
- *
- ****************************************************************************/
-
-#ifndef CONFIG_ARCH_PGPOOL_MAPPING
-static inline void arm_tmprestore(uint32_t l1save)
-{
- mmu_l1_restore(ARCH_SCRATCH_VBASE, l1save);
-}
-#endif
-
-/****************************************************************************
- * Name: arm_pgvaddr
- *
- * Description:
- * If the page memory pool is staticly mapped, then we do not have to
- * go through the the temporary mapping. We simply have to perform a
- * physical to virtual memory address mapping.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_ARCH_PGPOOL_MAPPING
-static inline uintptr_t arm_pgvaddr(uintptr_t paddr)
-{
- DEBUGASSERT(paddr >= CONFIG_ARCH_PGPOOL_PBASE &&
- paddr < CONFIG_ARCH_PGPOOL_PEND);
-
- return paddr - CONFIG_ARCH_PGPOOL_PBASE + CONFIG_ARCH_PGPOOL_VBASE;
-}
-#endif
-
-#endif /* CONFIG_MM_PGALLOC && CONFIG_ARCH_USE_MMU */
-#endif /* __ARCH_ARM_SRC_ARMV7_A_PGINLINE_H */
diff --git a/nuttx/arch/arm/src/common/up_signal_dispatch.c b/nuttx/arch/arm/src/common/up_signal_dispatch.c
deleted file mode 100644
index f0cf91a49..000000000
--- a/nuttx/arch/arm/src/common/up_signal_dispatch.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
- * arch/arm/src/common/up_signal_dispatch.c
- *
- * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/arch.h>
-
-#include "svcall.h"
-#include "up_internal.h"
-
-#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
- defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_SIGNALS)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: up_signal_dispatch
- *
- * Description:
- * In this kernel mode build, this function will be called to execute a
- * a signal handler in user-space. When the signal is delivered, a
- * kernel-mode stub will first run to perform some housekeeping functions.
- * This kernel-mode stub will then be called transfer control to the user
- * mode signal handler by calling this function.
- *
- * Normally the a user-mode signalling handling stub will also execute
- * before the ultimate signal handler is called. See
- * arch/arm/src/armv[6\7]/up_signal_handler. This function is the
- * user-space, signal handler trampoline function. It is called from
- * up_signal_dispatch() in user-mode.
- *
- * Inputs:
- * sighand - The address user-space signal handling function
- * signo, info, and ucontext - Standard arguments to be passed to the
- * signal handling function.
- *
- * Return:
- * None. This function does not return in the normal sense. It returns
- * via an architecture specific system call made by up_signal_handler().
- * However, this will look like a normal return by the caller of
- * up_signal_dispatch.
- *
- ****************************************************************************/
-
-void up_signal_dispatch(_sa_sigaction_t sighand, int signo,
- FAR siginfo_t *info, FAR void *ucontext)
-{
- /* Let sys_call4() do all of the work */
-
- (void)sys_call4(SYS_signal_handler, (uintptr_t)sighand, (uintptr_t)signo,
- (uintptr_t)info, (uintptr_t)ucontext);
-}
-
-#endif /* (CONFIG_BUILD_PROTECTED || CONFIG_BUILD_KERNEL) && !CONFIG_DISABLE_PTHREAD */