From bf1e6224d569612dabb8fac071417e7b0db65bdf Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 23 Sep 2014 12:16:44 -0600 Subject: [PATCH] Add platform-specific interfaces needed to support the shared memory feature --- Documentation/NuttxPortingGuide.html | 92 ++++++++++++++++++++++++---- Documentation/NuttxUserGuide.html | 3 - include/nuttx/arch.h | 44 +++++++++++++ 3 files changed, 125 insertions(+), 14 deletions(-) diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index aa4f3129a6..c188ee72d1 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -132,12 +132,17 @@ 4.5.5 sched_alarm_expiration()
4.5.6 irq_dispatch() - 4.6 On-Demand Paging
- 4.7 LED Support + 4.6 Shared Memory + 4.7 On-Demand Paging
+ 4.8 LED Support + 5.0 NuttX File System
@@ -3352,7 +3357,9 @@ VxWorks provides the following comparable interface:

Input Parameters:

Returned Value:

-

4.7.2 LED Definitions

+

4.8.2 LED Definitions

The implementation of LED support is very specific to a board architecture. @@ -3549,7 +3619,7 @@ void sched_timer_expiration(void); -

4.7.3 Common LED interfaces

+

4.8.3 Common LED interfaces

The <arch-name>/src/common/up_internal.h probably has definitions diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html index 68a191917a..fbef436618 100644 --- a/Documentation/NuttxUserGuide.html +++ b/Documentation/NuttxUserGuide.html @@ -9049,9 +9049,6 @@ int getsockopt(int sockfd, int level, int option, void *value, socklen_t *value_

  • 2.12.3 shmctl
  • 2.12.4 shmdt
    • -

    - NOTE: This is advance documentation. These interfaces are not yet available as of this writing. If you are reading this note, then double check; since these interfaces are under development now, I may have simply failed to remove it. -

    2.12.1 shmget

    diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h index aa65d33c92..7a8b9d0004 100644 --- a/include/nuttx/arch.h +++ b/include/nuttx/arch.h @@ -1188,6 +1188,50 @@ int up_addrenv_kstackalloc(FAR struct tcb_s *tcb); int up_addrenv_kstackfree(FAR struct tcb_s *tcb); #endif +/**************************************************************************** + * Name: up_shmat + * + * Description: + * Attach, i.e, map, on shared memory region to a user virtual address + * + * Input Parameters: + * pages - A pointer to the first element in a array of physical address, + * each corresponding to one page of memory. + * npages - The number of pages in the list of physical pages to be mapped. + * vaddr - The virtual address corresponding to the beginning of the + * (contiguous) virtual address region. + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +#ifdef CONFIG_MM_SHM +int up_shmat(FAR uintptr_t *pages, unsigned int npages, uintptr_t vaddr); +#endif + +/**************************************************************************** + * Name: up_shmdt + * + * Description: + * Detach, i.e, unmap, on shared memory region from a user virtual address + * + * Input Parameters: + * vaddr - The virtual address corresponding to the beginning of the + * (contiguous) virtual address region. + * npages - The number of pages to be unmapped + * + * Returned Value: + * Zero (OK) is returned on success; a negated errno value is returned + * on failure. + * + ****************************************************************************/ + +#ifdef CONFIG_MM_SHM +int up_shmdt(uintptr_t vaddr, unsigned int npages); +#endif + /**************************************************************************** * Name: up_interrupt_context *