From 4c36b97235c919e8001e08a6120fc86aae9dff3e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 21 Aug 2014 11:16:55 -0600 Subject: wdog.h does not contain any application interface, only internal OS interface. Further, it is non-standard. Move wdog.h from include/ to include/nuttx. For the same reason, move the description of the watchdog timer interfaces from the Users Guide to the Porting Guide. --- apps/netutils/ftpc/ftpc_internal.h | 5 +- misc/drivers/rtl8187x/rtl8187x.c | 2 +- nuttx/Documentation/NuttxPortingGuide.html | 296 +++++++-- nuttx/Documentation/NuttxUserGuide.html | 723 +++++++-------------- nuttx/arch/arm/src/c5471/c5471_ethernet.c | 2 +- nuttx/arch/arm/src/kinetis/kinetis_enet.c | 4 +- nuttx/arch/arm/src/kinetis/kinetis_sdhc.c | 4 +- nuttx/arch/arm/src/lpc17xx/lpc17_emc.c | 1 - nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 2 +- nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c | 2 +- nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c | 4 +- nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c | 2 +- nuttx/arch/arm/src/lpc31xx/lpc31_i2c.c | 4 +- nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c | 4 +- nuttx/arch/arm/src/sam34/sam_emac.c | 4 +- nuttx/arch/arm/src/sam34/sam_hsmci.c | 4 +- nuttx/arch/arm/src/sam34/sam_spi.c | 3 +- nuttx/arch/arm/src/sama5/sam_emaca.c | 2 +- nuttx/arch/arm/src/sama5/sam_emacb.c | 4 +- nuttx/arch/arm/src/sama5/sam_gmac.c | 4 +- nuttx/arch/arm/src/sama5/sam_hsmci.c | 6 +- nuttx/arch/arm/src/sama5/sam_spi.c | 5 +- nuttx/arch/arm/src/sama5/sam_ssc.c | 2 +- nuttx/arch/arm/src/sama5/sam_tsd.c | 2 +- nuttx/arch/arm/src/sama5/sam_twi.c | 4 +- nuttx/arch/arm/src/samd/sam_spi.c | 2 +- nuttx/arch/arm/src/stm32/stm32_eth.c | 6 +- nuttx/arch/arm/src/stm32/stm32_sdio.c | 6 +- nuttx/arch/arm/src/tiva/tiva_ethernet.c | 4 +- nuttx/arch/hc/src/m9s12/m9s12_ethernet.c | 6 +- nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c | 6 +- nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c | 4 +- nuttx/arch/z80/src/ez80/ez80_emac.c | 6 +- .../tools/zneo-zdsii-5_0_1-variadic-func-fix.patch | 6 +- .../tools/zneo-zdsii-5_0_1-variadic-func-fix.patch | 6 +- nuttx/drivers/input/ads7843e.c | 6 +- nuttx/drivers/input/ads7843e.h | 6 +- nuttx/drivers/input/max11802.c | 8 +- nuttx/drivers/input/max11802.h | 6 +- nuttx/drivers/input/stmpe811.h | 4 +- nuttx/drivers/net/cs89x0.c | 6 +- nuttx/drivers/net/dm90x0.c | 6 +- nuttx/drivers/net/e1000.c | 6 +- nuttx/drivers/net/enc28j60.c | 6 +- nuttx/drivers/net/encx24j600.c | 6 +- nuttx/drivers/net/skeleton.c | 4 +- nuttx/drivers/net/vnet.c | 6 +- nuttx/fs/fs_automount.c | 2 +- nuttx/fs/fs_poll.c | 6 +- nuttx/include/nuttx/net/cs89x0.h | 5 +- nuttx/include/nuttx/wdog.h | 110 ++++ nuttx/include/wdog.h | 110 ---- nuttx/net/arp/arp_timer.c | 2 +- nuttx/net/igmp/igmp_group.c | 6 +- nuttx/net/igmp/igmp_input.c | 4 +- nuttx/net/igmp/igmp_leave.c | 4 +- nuttx/net/igmp/igmp_timer.c | 4 +- nuttx/sched/mqueue/mq_timedreceive.c | 4 +- nuttx/sched/mqueue/mq_timedsend.c | 5 +- nuttx/sched/pthread/pthread_condtimedwait.c | 5 +- nuttx/sched/semaphore/sem_timedwait.c | 4 +- nuttx/sched/signal/sig_procmask.c | 7 +- nuttx/sched/signal/sig_releasependingsignal.c | 6 +- nuttx/sched/signal/sig_removependingsignal.c | 6 +- nuttx/sched/signal/sig_timedwait.c | 4 +- nuttx/sched/task/task_recover.c | 5 +- nuttx/sched/timer/timer.h | 4 +- nuttx/sched/timer/timer_create.c | 4 +- nuttx/sched/wdog/wd_cancel.c | 3 +- nuttx/sched/wdog/wd_create.c | 2 +- nuttx/sched/wdog/wd_delete.c | 2 +- nuttx/sched/wdog/wd_gettime.c | 2 +- nuttx/sched/wdog/wd_start.c | 2 +- nuttx/sched/wdog/wdog.h | 2 +- 74 files changed, 765 insertions(+), 772 deletions(-) create mode 100644 nuttx/include/nuttx/wdog.h delete mode 100644 nuttx/include/wdog.h diff --git a/apps/netutils/ftpc/ftpc_internal.h b/apps/netutils/ftpc/ftpc_internal.h index 5bb683f50..f4ef98b72 100644 --- a/apps/netutils/ftpc/ftpc_internal.h +++ b/apps/netutils/ftpc/ftpc_internal.h @@ -1,7 +1,7 @@ /**************************************************************************** * apps/netutils/ftpc/ftpc_internal.h * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -49,7 +49,8 @@ #include #include #include -#include + +#include #include diff --git a/misc/drivers/rtl8187x/rtl8187x.c b/misc/drivers/rtl8187x/rtl8187x.c index 597700bb9..5b43212d5 100644 --- a/misc/drivers/rtl8187x/rtl8187x.c +++ b/misc/drivers/rtl8187x/rtl8187x.c @@ -57,13 +57,13 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 971b01f8d..aaf1597c6 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -12,7 +12,7 @@

NuttX RTOS Porting Guide

-

Last Updated: August 12, 2014

+

Last Updated: August 21, 2014

@@ -101,7 +101,8 @@ 4.3.1 Basic System Timer
4.3.2 Hardware
4.3.3 System Tick and Time
- 4.3.4 Tickless OS + 4.3.4 Tickless OS
+ 4.3.5 Watchdog Timer Interfaces 4.4 Address Environments
    @@ -1734,7 +1735,7 @@ The system can be re-made subsequently by just typing make.

    4.2 APIs Exported by Architecture-Specific Logic to NuttX

    4.2.1 up_initialize()

    -

    Prototype: void up_initialize(void);

    +

    Function Prototype: void up_initialize(void);

    Description. up_initialize() will be called once during OS @@ -1754,7 +1755,7 @@ The system can be re-made subsequently by just typing make.

    4.2.2 up_idle()

    -

    Prototype: void up_idle(void);

    +

    Function Prototype: void up_idle(void);

    Description. up_idle() is the logic that will be executed @@ -1768,7 +1769,7 @@ The system can be re-made subsequently by just typing make.

    4.2.3 up_initial_state()

    -

    Prototype: void up_initial_state(FAR struct tcb_s *tcb);

    +

    Function Prototype: void up_initial_state(FAR struct tcb_s *tcb);

    Description. A new thread is being started and a new TCB has been created. @@ -1791,7 +1792,7 @@ The system can be re-made subsequently by just typing make.

    4.2.4 up_create_stack()

    -

    Prototype: STATUS up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype);

    +

    Function Prototype: STATUS up_create_stack(FAR struct tcb_s *tcb, size_t stack_size, uint8_t ttype);

    Description. Allocate a stack for a new thread and setup up stack-related information in the TCB. @@ -1843,7 +1844,7 @@ The system can be re-made subsequently by just typing make.

4.2.5 up_use_stack()

-

Prototype: +

Function Prototype: STATUS up_use_stack(FAR struct tcb_s *tcb, FAR void *stack, size_t stack_size);

@@ -1882,7 +1883,7 @@ The system can be re-made subsequently by just typing make.

4.2.6 up_stack_frame()

-

Prototype: FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size);

+

Function Prototype: FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size);

Description. @@ -1932,7 +1933,7 @@ The system can be re-made subsequently by just typing make.

4.2.7 up_release_stack()

-

Prototype: void up_release_stack(FAR struct tcb_s *dtcb);

+

Function Prototype: void up_release_stack(FAR struct tcb_s *dtcb);

Description. A task has been stopped. @@ -1971,7 +1972,7 @@ The system can be re-made subsequently by just typing make.

4.2.8 up_unblock_task()

-

Prototype: void up_unblock_task(FAR struct tcb_s *tcb);

+

Function Prototype: void up_unblock_task(FAR struct tcb_s *tcb);

Description. A task is currently in an inactive task list @@ -1994,7 +1995,7 @@ The system can be re-made subsequently by just typing make.

4.2.9 up_block_task()

-

Prototype: void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state);

+

Function Prototype: void up_block_task(FAR struct tcb_s *tcb, tstate_t task_state);

Description. The currently executing task at the head of @@ -2020,7 +2021,7 @@ The system can be re-made subsequently by just typing make.

4.2.10 up_release_pending()

-

Prototype: void up_release_pending(void);

+

Function Prototype: void up_release_pending(void);

Description. When tasks become ready-to-run but cannot run because pre-emption @@ -2037,7 +2038,7 @@ The system can be re-made subsequently by just typing make.

4.2.11 up_reprioritize_rtr()

-

Prototype: void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority);

+

Function Prototype: void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority);

Description. Called when the priority of a running or @@ -2072,7 +2073,7 @@ The system can be re-made subsequently by just typing make.

4.2.12 _exit()

-

Prototype: void _exit(int status) noreturn_function;

+

Function Prototype: void _exit(int status) noreturn_function;

Description. This function causes the currently executing task to cease @@ -2086,7 +2087,7 @@ The system can be re-made subsequently by just typing make.

4.2.13 up_assert()

-

Prototype:
+

Function Prototype:
void up_assert(FAR const uint8_t *filename, int linenum);

@@ -2095,7 +2096,7 @@ The system can be re-made subsequently by just typing make.

4.2.14 up_schedule_sigaction()

-

Prototype: +

Function Prototype: void up_schedule_sigaction(FAR struct tcb_s *tcb, sig_deliver_t sigdeliver);

@@ -2142,7 +2143,7 @@ The system can be re-made subsequently by just typing make.

4.2.15 up_allocate_heap()

-

Prototype: void up_allocate_heap(FAR void **heap_start, size_t *heap_size);

+

Function Prototype: void up_allocate_heap(FAR void **heap_start, size_t *heap_size);

Description. This function will be called to dynamically set aside the heap region. @@ -2153,14 +2154,14 @@ The system can be re-made subsequently by just typing make.

4.2.16 up_interrupt_context()

-

Prototype: bool up_interrupt_context(void)

+

Function Prototype: bool up_interrupt_context(void)

Description. Return true if we are currently executing in the interrupt handler context.

4.2.17 up_disable_irq()

-

Prototype:

+

Function Prototype:

     #ifndef CONFIG_ARCH_NOINTC
   void up_disable_irq(int irq);
@@ -2187,7 +2188,7 @@ The system can be re-made subsequently by just typing make.
 
    
 
 
    4.2.18 up_enable_irq()
    
-
    Prototype:
    
+
    Function Prototype:
    
 
       #ifndef CONFIG_ARCH_NOINTC
   void up_enable_irq(int irq);
@@ -2208,7 +2209,7 @@ The system can be re-made subsequently by just typing make.
 
      
 
 
      4.2.19 up_prioritize_irq()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
         #ifdef CONFIG_ARCH_IRQPRIO
   void up_enable_irq(int irq);
@@ -2226,7 +2227,7 @@ The system can be re-made subsequently by just typing make.
 
 
        4.2.20 up_putc()
        
 
-
        Prototype: int up_putc(int ch);
        
+
        Function Prototype: int up_putc(int ch);
        
 
        Description.
   This is a debug interface exported by the architecture-specific logic.
   Output one character on the console
@@ -2555,7 +2556,7 @@ config ARCH_SIM
 
      
 
 
      4.3.4.4.1 up_timer_initialize()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
         #include <nuttx/arch.h>
 void up_timer_initialize(void);
@@ -2578,7 +2579,7 @@ void up_timer_initialize(void);
 
      
 
 
      4.3.4.4.2 up_timer_gettime()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
         #include <nuttx/arch.h>
 int up_timer_gettime(FAR struct timespec *ts);
@@ -2602,7 +2603,7 @@ int up_timer_gettime(FAR struct timespec *ts);
 
      
 
 
      4.3.4.4.3 up_alarm_cancel()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
         #include <nuttx/arch.h>
 int up_alarm_cancel(FAR struct timespec *ts);
@@ -2625,7 +2626,7 @@ int up_alarm_cancel(FAR struct timespec *ts);
 
      
 
 
      4.3.4.4.5 up_alarm_start()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
         #include <nuttx/arch.h>
 int up_alarm_start(FAR const struct timespec *ts);
@@ -2648,7 +2649,7 @@ int up_alarm_start(FAR const struct timespec *ts);
 
      
 
 
      4.3.4.4.5 up_timer_cancel()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
         #include <nuttx/arch.h>
 int up_timer_cancel(FAR struct timespec *ts);
@@ -2671,7 +2672,7 @@ int up_timer_cancel(FAR struct timespec *ts);
 
      
 
 
      4.3.4.4.6 up_timer_start()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
         #include <nuttx/arch.h>
 int up_timer_start(FAR const struct timespec *ts);
@@ -2693,6 +2694,221 @@ int up_timer_start(FAR const struct timespec *ts);
   May be called from interrupt level handling or from the normal tasking level. Interrupts may need to be disabled internally to assure non-reentrancy.
 
      
 
+
      4.3.5 Watchdog Timer Interfaces
      
+
      
+  NuttX provides a general watchdog timer facility.
+  This facility allows the NuttX user to specify a watchdog timer function
+  that will run after a specified delay.
+  The watchdog timer function will run in the context of the timer interrupt handler.
+  Because of this, a limited number of NuttX interfaces are available to he watchdog timer function.
+  However, the watchdog timer function may use mq_send(), sigqueue(),
+  or kill() to communicate with NuttX tasks.
+
      
+
+
+
      4.3.5.1 wd_create
      
+
+
      
+Function Prototype:
+
      +    #include <nuttx/wdog.h>
+    WDOG_ID wd_create(void);
+
      
+
+
      
+Description: The wd_create function will create a watchdog
+by allocating the appropriate resources for the watchdog.
+
      
+Input Parameters: None.
+
      
+Returned Value:
+
        
+
      • Pointer to watchdog that may be used as a handle in subsequent
+NuttX calls (i.e., the watchdog ID), or NULL if insufficient resources
+are available to create the watchdogs.
+
      
+
+
      
+Assumptions/Limitations:
+
      
+  POSIX  Compatibility: This is a NON-POSIX interface.
+VxWorks provides the following comparable interface:
+
      +    WDOG_ID wdCreate (void);
+
      
+
+
      
+Differences from the VxWorks interface include:
+
        
+
      • The number of available watchdogs is fixed (configured at
+initialization time).
+
      
+
+
      4.3.5.2 wd_delete
      
+
+
      
+Function Prototype:
+
      +    #include <nuttx/wdog.h>
+    int wd_delete(WDOG_ID wdog);
+
      
+
+
      
+Description: The wd_delete function will deallocate a
+watchdog. The watchdog will be removed from the timer queue if
+has been started.
+
      
+Input Parameters:
+
        
+
      • wdog. The watchdog ID to delete. This is actually a
+pointer to a watchdog structure.
+
      
+
+
      
+Returned Value:
+
        
+
      • OK or ERROR
+
      
+
+
      
+Assumptions/Limitations: It is the responsibility of the
+caller to assure that the watchdog is inactive before deleting
+it.
+
      
+POSIX  Compatibility: This is a NON-POSIX interface.
+VxWorks provides the following comparable interface:
+
      +    STATUS wdDelete (WDOG_ID wdog);
+
      
+
+
      
+Differences from the VxWorks interface include:
+
        
+
      • Does not make any checks to see if the watchdog is being used
+before deallocating it (i.e., never returns ERROR).
+
      
+
+
      4.3.5.3 wd_start
      
+
+
      
+Function Prototype:
+
      +    #include <nuttx/wdog.h>
+    int wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry,
+                 int argc, ....);
+
      
+
+
      
+Description: This function adds a watchdog to the timer
+queue. The specified watchdog function will be called from the
+interrupt level after the specified number of ticks has elapsed.
+Watchdog timers may be started from the interrupt level.
+
      
+Watchdog times execute in the context of the timer interrupt handler.
+
      
+Watchdog timers execute only once.
+
      
+To replace either the timeout delay or the function to be executed,
+call wd_start again with the same wdog; only the most recent
+wd_start() on a given watchdog ID has any effect.
+
      
+Input Parameters:
+
        
+
      • wdog. Watchdog ID
+
      • delay. Delay count in clock ticks
+
      • wdentry. Function to call on timeout
+
      • argc.  The number of uint32_t parameters to pass to wdentry.
+
      • .... uint32_t size parameters to pass to wdentry
+
      
+
+
      
+Returned Value:
+
        
+
      • OK or ERROR
+
      
+
+
      
+Assumptions/Limitations: The watchdog routine runs in the
+context of the timer interrupt handler and is subject to all ISR
+restrictions.
+
      
+POSIX  Compatibility: This is a NON-POSIX interface.
+VxWorks provides the following comparable interface:
+
      +    STATUS wdStart (WDOG_ID wdog, int delay, FUNCPTR wdentry, int parameter);
+
      
+
+
      
+Differences from the VxWorks interface include:
+
        
+
      • The present implementation supports multiple parameters passed
+to wdentry; VxWorks supports only a single parameter.  The maximum
+number of parameters is determined by
+
      
+
+
      4.3.5.4 wd_cancel
      
+
      
+Function Prototype:
+
      +    #include <nuttx/wdog.h>
+    int wd_cancel(WDOG_ID wdog);
+
      
+
+
      
+Description: This function cancels a currently running
+watchdog timer. Watchdog timers may be canceled from the interrupt
+level.
+
      
+Input Parameters:
+
        
+
      • wdog. ID of the watchdog to cancel.
+
      
+
+
      
+Returned Value:
+
        
+
      • OK or ERROR
+
      
+
+
      
+Assumptions/Limitations:
+
      
+POSIX  Compatibility: This is a NON-POSIX interface.
+VxWorks provides the following comparable interface:
+
      +    STATUS wdCancel (WDOG_ID wdog);
+
      
+
+
      4.3.5.5 wd_gettime
      
+
      
+  Function Prototype:
+
      
+
      +    #include <nuttx/wdog.h>
+    Sint wd_gettime(WDOG_ID wdog);
+
      
+
      
+  Description:
+   This function returns the time remaining before the specified watchdog expires.
+
      
+
      
+  Input Parameters:
+  
        
+    
      • wdog. Identifies the watchdog that the request is for.
        • 
+  
      
+
      
+
      
+  Returned Value:
+  The time in system ticks remaining until the watchdog time expires.  Zero
+  means either that wdog is not valid or that the wdog has already expired.
+
      
+
 
      4.4 Address Environments
      
 
      
   CPUs that support memory management units (MMUs) may provide address environments within which tasks and their child threads execute.
@@ -2763,7 +2979,7 @@ int up_timer_start(FAR const struct timespec *ts);
 
 
 
      4.4.1 up_addrenv_create()
      
-
      Prototype:
      
+
      Function Prototype:
      
 
        
   int up_addrenv_create(size_t envsize, FAR task_addrenv_t *addrenv);
 
      
@@ -2783,7 +2999,7 @@ int up_timer_start(FAR const struct timespec *ts);
 
    
 
 
    4.4.2 up_addrenv_vaddr()
    
-
    Prototype:
    
+
    Function Prototype:
    
 
      
   int up_addrenv_vaddr(FAR task_addrenv_t addrenv, FAR void **vaddr);
 
    
@@ -2803,7 +3019,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.4.3 up_addrenv_select()

-

Prototype:

+

Function Prototype:

    int up_addrenv_select(task_addrenv_t addrenv, hw_addrenv_t *oldenv);
@@ -2827,7 +3043,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.4.4 up_addrenv_restore()

-

Prototype:

+

Function Prototype:

    int up_addrenv_restore(hw_addrenv_t oldenv);
@@ -2846,7 +3062,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.4.5 up_addrenv_destroy()

-

Prototype:

+

Function Prototype:

    int up_addrenv_destroy(task_addrenv_t addrenv);
@@ -2864,7 +3080,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.4.6 up_addrenv_assign()

-

Prototype:

+

Function Prototype:

    int up_addrenv_assign(task_addrenv_t addrenv, FAR struct tcb_s *tcb);
@@ -2883,7 +3099,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.4.7 up_addrenv_share()

-

Prototype:

+

Function Prototype:

    int up_addrenv_share(FAR const struct tcb_s *ptcb, FAR struct tcb_s *ctcb);
@@ -2903,7 +3119,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.4.8 up_addrenv_release()

-

Prototype:

+

Function Prototype:

    int up_addrenv_release(FAR struct tcb_s *tcb);
@@ -2939,7 +3155,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.5.3 sched_process_timer()

-

Prototype: void sched_process_timer(void);

+

Function Prototype: void sched_process_timer(void);

Description. This function handles system timer events. @@ -2950,7 +3166,7 @@ int up_timer_start(FAR const struct timespec *ts);

4.5.4 sched_timer_expiration()

-

Prototype:

+

Function Prototype:

     #include <nuttx/arch.h>
 void sched_timer_expiration(void);
@@ -2973,7 +3189,7 @@ void sched_timer_expiration(void);

4.5.5 sched_alaram_expiration()

-

Prototype:

+

Function Prototype:

     #include <nuttx/arch.h>
 void sched_timer_expiration(void);
@@ -2996,7 +3212,7 @@ void sched_timer_expiration(void);

4.5.6 irq_dispatch()

-

Prototype: void irq_dispatch(int irq, FAR void *context);

+

Function Prototype: void irq_dispatch(int irq, FAR void *context);

Description. This function must be called from the architecture- diff --git a/nuttx/Documentation/NuttxUserGuide.html b/nuttx/Documentation/NuttxUserGuide.html index 9c8b5adb0..07246ff7e 100644 --- a/nuttx/Documentation/NuttxUserGuide.html +++ b/nuttx/Documentation/NuttxUserGuide.html @@ -13,7 +13,7 @@

NuttX Operating System

User's Manual

by

Gregory Nutt

-

Last Updated: January 13, 2014

+

Last Updated: August 21, 2014

@@ -57,13 +57,12 @@
  • Paragraph 2.3 Task Control Interfaces
  • Paragraph 2.4 Named Message Queue Interfaces
  • Paragraph 2.5 Counting Semaphore Interfaces
    • -
  • Paragraph 2.6 Watchdog Timer Interfaces
    • -
  • Paragraph 2.7 Clocks and Timers
    • -
  • Paragraph 2.8 Signal Interfaces
    • -
  • Paragraph 2.9 Pthread Interfaces
    • -
  • Paragraph 2.10 Environment Variables
    • -
  • Paragraph 2.11 File System Interfaces
    • -
  • Paragraph 2.12 Network Interfaces
    • +
  • Paragraph 2.6 Clocks and Timers
    • +
  • Paragraph 2.7 Signal Interfaces
    • +
  • Paragraph 2.8 Pthread Interfaces
    • +
  • Paragraph 2.9 Environment Variables
    • +
  • Paragraph 2.10 File System Interfaces
    • +
  • Paragraph 2.11 Network Interfaces
  • @@ -3872,251 +3871,29 @@ interface of the same name.
    -

    2.6 Watchdog Timer Interfaces

     +

    2.6 Clocks and Timers
    -

    - NuttX provides a general watchdog timer facility. - This facility allows the NuttX user to specify a watchdog timer function - that will run after a specified delay. - The watchdog timer function will run in the context of the timer interrupt handler. - Because of this, a limited number of NuttX interfaces are available to he watchdog timer function. - However, the watchdog timer function may use mq_send(), sigqueue(), - or kill() to communicate with NuttX tasks. -

    - - -

    2.6.1 wd_create

    - -

    -Function Prototype: -

    -    #include <wdog.h>
-    WDOG_ID wd_create(void);
-
    - -

    -Description: The wd_create function will create a watchdog -by allocating the appropriate resources for the watchdog. -

    -Input Parameters: None. -

    -Returned Value: -

      -
    • Pointer to watchdog that may be used as a handle in subsequent -NuttX calls (i.e., the watchdog ID), or NULL if insufficient resources -are available to create the watchdogs. -
    - -

    -Assumptions/Limitations: -

    - POSIX Compatibility: This is a NON-POSIX interface. -VxWorks provides the following comparable interface: -

    -    WDOG_ID wdCreate (void);
-
    - -

    -Differences from the VxWorks interface include: -

      -
    • The number of available watchdogs is fixed (configured at -initialization time). -
    - -

    2.6.2 wd_delete

    - -

    -Function Prototype: -

    -    #include <wdog.h>
-    int wd_delete(WDOG_ID wdog);
-
    - -

    -Description: The wd_delete function will deallocate a -watchdog. The watchdog will be removed from the timer queue if -has been started. -

    -Input Parameters: -

      -
    • wdog. The watchdog ID to delete. This is actually a -pointer to a watchdog structure. -
    - -

    -Returned Value: -

      -
    • OK or ERROR -
    - -

    -Assumptions/Limitations: It is the responsibility of the -caller to assure that the watchdog is inactive before deleting -it. -

    -POSIX Compatibility: This is a NON-POSIX interface. -VxWorks provides the following comparable interface: -

    -    STATUS wdDelete (WDOG_ID wdog);
-
    - -

    -Differences from the VxWorks interface include: -

      -
    • Does not make any checks to see if the watchdog is being used -before deallocating it (i.e., never returns ERROR). -
    - -

    2.6.3 wd_start

    - -

    -Function Prototype: -

    -    #include <wdog.h>
-    int wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry,
-                 int argc, ....);
-
    - -

    -Description: This function adds a watchdog to the timer -queue. The specified watchdog function will be called from the -interrupt level after the specified number of ticks has elapsed. -Watchdog timers may be started from the interrupt level. -

    -Watchdog times execute in the context of the timer interrupt handler. -

    -Watchdog timers execute only once. -

    -To replace either the timeout delay or the function to be executed, -call wd_start again with the same wdog; only the most recent -wd_start() on a given watchdog ID has any effect. -

    -Input Parameters: -

      -
    • wdog. Watchdog ID -
    • delay. Delay count in clock ticks -
    • wdentry. Function to call on timeout -
    • argc. The number of uint32_t parameters to pass to wdentry. -
    • .... uint32_t size parameters to pass to wdentry -
    - -

    -Returned Value: -

      -
    • OK or ERROR -
    - -

    -Assumptions/Limitations: The watchdog routine runs in the -context of the timer interrupt handler and is subject to all ISR -restrictions. -

    -POSIX Compatibility: This is a NON-POSIX interface. -VxWorks provides the following comparable interface: -

    -    STATUS wdStart (WDOG_ID wdog, int delay, FUNCPTR wdentry, int parameter);
-
    - -

    -Differences from the VxWorks interface include: -

      -
    • The present implementation supports multiple parameters passed -to wdentry; VxWorks supports only a single parameter. The maximum -number of parameters is determined by -
    - -

    2.6.4 wd_cancel

    -

    -Function Prototype: -

    -    #include <wdog.h>
-    int wd_cancel(WDOG_ID wdog);
-
    - -

    -Description: This function cancels a currently running -watchdog timer. Watchdog timers may be canceled from the interrupt -level. -

    -Input Parameters: -

      -
    • wdog. ID of the watchdog to cancel. -
    - -

    -Returned Value:

    -

    -Assumptions/Limitations: -

    -POSIX Compatibility: This is a NON-POSIX interface. -VxWorks provides the following comparable interface: -

    -    STATUS wdCancel (WDOG_ID wdog);
-
    - -

    2.6.5 wd_gettime

    -

    - Function Prototype: -

    -
    -    #include <wdog.h>
-    Sint wd_gettime(WDOG_ID wdog);
-
    -

    - Description: - This function returns the time remaining before the specified watchdog expires. -

    -

    - Input Parameters: -

      -
    • wdog. Identifies the watchdog that the request is for.
      • -
    -

    -

    - Returned Value: - The time in system ticks remaining until the watchdog time expires. Zero - means either that wdog is not valid or that the wdog has already expired. -

    - - - - - -
    -

    2.7 Clocks and Timers

     -
    - - - -

    2.7.1 clock_settime

    +

    2.6.1 clock_settime

    Function Prototype:

    @@ -4144,7 +3921,7 @@ VxWorks provides the following comparable interface:
  • To be provided.
    • -

    2.7.2 clock_gettime

    +

    2.6.2 clock_gettime

    Function Prototype:

    @@ -4172,7 +3949,7 @@ VxWorks provides the following comparable interface:
  • To be provided.
    • -

    2.7.3 clock_getres

    +

    2.6.3 clock_getres

    Function Prototype:

    @@ -4200,7 +3977,7 @@ VxWorks provides the following comparable interface:
  • To be provided.
    • -

    2.7.4 mktime

    +

    2.6.4 mktime

    Function Prototype:

    @@ -4228,7 +4005,7 @@ VxWorks provides the following comparable interface:
  • To be provided.
    • -

    2.7.5 gmtime

    +

    2.6.5 gmtime

    Function Prototype:

    @@ -4261,13 +4038,13 @@ VxWorks provides the following comparable interface:
  • To be provided.
    • -

    2.7.6 localtime

    +

    2.6.6 localtime

         #include <time.h>
     #define localtime(c) gmtime(c)
    -

    2.7.7 gmtime_r

    +

    2.6.7 gmtime_r

    Function Prototype:

    @@ -4301,13 +4078,13 @@ VxWorks provides the following comparable interface:
  • To be provided.
    • -

    2.7.8 localtime_r

    +

    2.6.8 localtime_r

         #include <time.h>
     #define localtime_r(c,r) gmtime_r(c,r)
    -

    2.7.9 timer_create

    +

    2.6.9 timer_create

    Function Prototype:

    @@ -4377,7 +4154,7 @@ VxWorks provides the following comparable interface:
  • Only CLOCK_REALTIME is supported for the clockid argument.
    • -

    2.7.10 timer_delete

    +

    2.6.10 timer_delete

    Function Prototype:

    @@ -4416,7 +4193,7 @@ VxWorks provides the following comparable interface: Comparable to the POSIX interface of the same name.

    -

    2.7.11 timer_settime

    +

    2.6.11 timer_settime

    Function Prototype:

    @@ -4499,7 +4276,7 @@ VxWorks provides the following comparable interface:
  • The ovalue argument is ignored.
    • -

    2.7.12 timer_gettime

    +

    2.6.12 timer_gettime

    Function Prototype:

    @@ -4546,7 +4323,7 @@ VxWorks provides the following comparable interface: Comparable to the POSIX interface of the same name.

    -

    2.7.13 timer_getoverrun

    +

    2.6.13 timer_getoverrun

    Function Prototype:

    @@ -4607,7 +4384,7 @@ VxWorks provides the following comparable interface: interface of the same name.

    -

    2.7.14 gettimeofday

    +

    2.6.14 gettimeofday

    Function Prototype:

    @@ -4637,7 +4414,7 @@ interface of the same name.
    -

    2.8 Signal Interfaces

     +

    2.7 Signal Interfaces
    @@ -4703,23 +4480,23 @@ interface of the same name. The following signal handling interfaces are provided by NuttX:

    -

    2.8.1 sigemptyset

    +

    2.7.1 sigemptyset

    Function Prototype: @@ -4749,7 +4526,7 @@ by set such that all signals are excluded. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.2 sigfillset

    +

    2.7.2 sigfillset

    Function Prototype: @@ -4779,7 +4556,7 @@ by set such that all signals are included. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.3 sigaddset

    +

    2.7.3 sigaddset

    Function Prototype: @@ -4810,7 +4587,7 @@ signo to the signal set specified by set. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.4 sigdelset

    +

    2.7.4 sigdelset

    Function Prototype: @@ -4841,7 +4618,7 @@ by signo from the signal set specified by set. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.5 sigismember

    +

    2.7.5 sigismember

    Function Prototype: @@ -4874,7 +4651,7 @@ by signo is a member of the set specified by set. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.6 sigaction

    +

    2.7.6 sigaction

    Function Prototype: @@ -4951,7 +4728,7 @@ Differences from the POSIX implementation include: -

    2.8.7 sigprocmask

    +

    2.7.7 sigprocmask

    Function Prototype: @@ -5001,7 +4778,7 @@ pointed to by the set input parameter. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.8 sigpending

    +

    2.7.8 sigpending

    Function Prototype: @@ -5039,7 +4816,7 @@ is delivered more than once." POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.9 sigsuspend

    +

    2.7.9 sigsuspend

    Function Prototype: @@ -5087,7 +4864,7 @@ function or to terminate the task." Only delivery of the signal is required in the present implementation (even if the signal is ignored). -

    2.8.10 sigwaitinfo

    +

    2.7.10 sigwaitinfo

    Function Prototype: @@ -5119,7 +4896,7 @@ with a NULL timeout parameter. (see below). POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.8.11 sigtimedwait

    +

    2.7.11 sigtimedwait

    Function Prototype: @@ -5185,7 +4962,7 @@ that the unblocked signal be caught; the task will be resumed even if the unblocked signal is ignored. -

    2.8.12 sigqueue

    +

    2.7.12 sigqueue

    Function Prototype: @@ -5242,7 +5019,7 @@ There is no null signal in the present implementation; a zero signal will be sent. -

    2.8.13 kill

    +

    2.7.13 kill

    Function Prototype: @@ -5298,7 +5075,7 @@ be sent.

  • Sending of signals to 'process groups' is not supported in NuttX.
    • -

    2.8.14 pause

    +

    2.7.14 pause

    Function Prototype: @@ -5334,7 +5111,7 @@ be sent.
    -

    2.9 Pthread Interfaces

     +

    2.8 Pthread Interfaces
    @@ -5361,27 +5138,27 @@ be sent. Interfaces that allow you to create and manage pthreads.

    Thread Specific Data. @@ -5391,64 +5168,64 @@ be sent. (2) The main task thread does not had thread-specific data.

    pthread Mutexes.

    Condition Variables.

    Barriers.

    Initialization.

    Signals.

    @@ -5505,7 +5282,7 @@ be sent.

  • pthread_testcancel. set cancelability state.
    • -

    2.9.1 pthread_attr_init

    +

    2.8.1 pthread_attr_init

    Function Prototype:

    @@ -5538,7 +5315,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.2 pthread_attr_destroy

    +

    2.8.2 pthread_attr_destroy

    Function Prototype:

    @@ -5570,7 +5347,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.3 pthread_attr_setschedpolicy

    +

    2.8.3 pthread_attr_setschedpolicy

    Function Prototype:

    @@ -5601,7 +5378,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.4 pthread_attr_getschedpolicy

    +

    2.8.4 pthread_attr_getschedpolicy

    Function Prototype:

    @@ -5632,7 +5409,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.5 pthread_attr_getschedpolicy

    +

    2.8.5 pthread_attr_getschedpolicy

    Function Prototype:

    @@ -5664,7 +5441,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.6 pthread_attr_getschedparam

    +

    2.8.6 pthread_attr_getschedparam

    Function Prototype:

    @@ -5696,7 +5473,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.7 pthread_attr_setinheritsched

    +

    2.8.7 pthread_attr_setinheritsched

    Function Prototype:

    @@ -5728,7 +5505,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.8 pthread_attr_getinheritsched

    +

    2.8.8 pthread_attr_getinheritsched

    Function Prototype:

    @@ -5760,7 +5537,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.9 pthread_attr_setstacksize

    +

    2.8.9 pthread_attr_setstacksize

    Function Prototype:

    @@ -5791,7 +5568,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.10 pthread_attr_getstacksize

    +

    2.8.10 pthread_attr_getstacksize

    Function Prototype:

    @@ -5822,7 +5599,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.11 pthread_create

    +

    2.8.11 pthread_create

    Function Prototype:

    @@ -5861,7 +5638,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.12 pthread_detach

    +

    2.8.12 pthread_detach

    Function Prototype:

    @@ -5894,7 +5671,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.13 pthread_exit

    +

    2.8.13 pthread_exit

    Function Prototype:

    @@ -5926,7 +5703,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.14 pthread_cancel

    +

    2.8.14 pthread_cancel

    Function Prototype:

    @@ -5982,7 +5759,7 @@ the time when cancellation is re-enabled.

  • Thread cancellation at cancellation points is not supported.
    • -

    2.9.15 pthread_setcancelstate

    +

    2.8.15 pthread_setcancelstate

    Function Prototype:

    @@ -6024,7 +5801,7 @@ No thread could be found corresponding to that specified by the given thread ID. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.16 pthread_testcancelstate

    +

    2.8.16 pthread_testcancelstate

    Function Prototype:

    @@ -6055,7 +5832,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.17 pthread_join

    +

    2.8.17 pthread_join

    Function Prototype:

    @@ -6088,7 +5865,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.18 pthread_yield

    +

    2.8.18 pthread_yield

    Function Prototype:

    @@ -6121,7 +5898,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.19 pthread_self

    +

    2.8.19 pthread_self

    Function Prototype:

    @@ -6153,7 +5930,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.20 pthread_getschedparam

    +

    2.8.20 pthread_getschedparam

    Function Prototype:

    @@ -6219,7 +5996,7 @@ interface of the same name. Comparable to the POSIX interface of the same name.

    -

    2.9.21 pthread_setschedparam

    +

    2.8.21 pthread_setschedparam

    Function Prototype:

    @@ -6311,7 +6088,7 @@ interface of the same name. Comparable to the POSIX interface of the same name.

    -

    2.9.22 pthread_key_create

    +

    2.8.22 pthread_key_create

    Function Prototype:

    @@ -6366,7 +6143,7 @@ interface of the same name.

  • The present implementation ignores the destructor argument. -

    2.9.23 pthread_setspecific

    +

    2.8.23 pthread_setspecific

    Function Prototype:

    @@ -6416,7 +6193,7 @@ interface of the same name. destructor function. -

    2.9.24 pthread_getspecific

    +

    2.8.24 pthread_getspecific

    Function Prototype:

    @@ -6457,7 +6234,7 @@ interface of the same name. destructor function. -

    2.9.25 pthread_key_delete

    +

    2.8.25 pthread_key_delete

    Function Prototype:

    @@ -6489,7 +6266,7 @@ this function does nothing in the present implementation. POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.26 pthread_mutexattr_init

    +

    2.8.26 pthread_mutexattr_init

    Function Prototype:

    @@ -6520,7 +6297,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.27 pthread_mutexattr_destroy

    +

    2.8.27 pthread_mutexattr_destroy

    Function Prototype:

    @@ -6551,7 +6328,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.28 pthread_mutexattr_getpshared

    +

    2.8.28 pthread_mutexattr_getpshared

    Function Prototype:

    @@ -6583,7 +6360,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.29 pthread_mutexattr_setpshared

    +

    2.8.29 pthread_mutexattr_setpshared

    Function Prototype:

    @@ -6615,7 +6392,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.30 pthread_mutexattr_gettype

    +

    2.8.30 pthread_mutexattr_gettype

    Function Prototype:

    @@ -6650,7 +6427,7 @@ returned to indicate the error:

    POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.31 pthread_mutexattr_settype

    +

    2.8.31 pthread_mutexattr_settype

    Function Prototype:

    @@ -6704,7 +6481,7 @@ returned to indicate the error:

    POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.32 pthread_mutex_init

    +

    2.8.32 pthread_mutex_init

    Function Prototype:

    @@ -6736,7 +6513,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.33 pthread_mutex_destroy

    +

    2.8.33 pthread_mutex_destroy

    Function Prototype:

    @@ -6767,7 +6544,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.34 pthread_mutex_lock

    +

    2.8.34 pthread_mutex_lock

    Function Prototype:

    @@ -6833,7 +6610,7 @@ Otherwise, an error number will be returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.35 pthread_mutex_trylock

    +

    2.8.35 pthread_mutex_trylock

    Function Prototype:

    @@ -6873,7 +6650,7 @@ Otherwise, an error number will be returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.36 pthread_mutex_unlock

    +

    2.8.36 pthread_mutex_unlock

    Function Prototype:

    @@ -6919,7 +6696,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.37 pthread_condattr_init

    +

    2.8.37 pthread_condattr_init

    Function Prototype:

    @@ -6950,7 +6727,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.38 pthread_condattr_destroy

    +

    2.8.38 pthread_condattr_destroy

    Function Prototype:

    @@ -6981,7 +6758,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.39 pthread_cond_init

    +

    2.8.39 pthread_cond_init

    Function Prototype:

    @@ -7012,7 +6789,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.40 pthread_cond_destroy

    +

    2.8.40 pthread_cond_destroy

    Function Prototype:

    @@ -7043,7 +6820,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.41 pthread_cond_broadcast

    +

    2.8.41 pthread_cond_broadcast

    Function Prototype:

    @@ -7074,7 +6851,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.42 pthread_cond_signal

    +

    2.8.42 pthread_cond_signal

    Function Prototype:

    @@ -7105,7 +6882,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.43 pthread_cond_wait

    +

    2.8.43 pthread_cond_wait

    Function Prototype:

    @@ -7136,7 +6913,7 @@ returned to indicate the error: POSIX Compatibility: Comparable to the POSIX interface of the same name. -

    2.9.44 pthread_cond_timedwait

    +

    2.8.44 pthread_cond_timedwait

    Function Prototype:

    @@ -7173,7 +6950,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.45 pthread_barrierattr_init

    +

    2.8.45 pthread_barrierattr_init

    Function Prototype:

    @@ -7206,7 +6983,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.46 pthread_barrierattr_destroy

    +

    2.8.46 pthread_barrierattr_destroy

    Function Prototype:

    @@ -7238,7 +7015,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.47 pthread_barrierattr_setpshared

    +

    2.8.47 pthread_barrierattr_setpshared

    Function Prototype:

    @@ -7276,7 +7053,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.48 pthread_barrierattr_getpshared

    +

    2.8.48 pthread_barrierattr_getpshared

    Function Prototype:

    @@ -7308,7 +7085,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.49 pthread_barrier_init

    +

    2.8.49 pthread_barrier_init

    Function Prototype:

    @@ -7378,7 +7155,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.50 pthread_barrier_destroy

    +

    2.8.50 pthread_barrier_destroy

    Function Prototype:

    @@ -7422,7 +7199,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.51 pthread_barrier_wait

    +

    2.8.51 pthread_barrier_wait

    Function Prototype:

    @@ -7482,7 +7259,7 @@ interface of the same name.

    -

    2.9.52 pthread_once

    +

    2.8.52 pthread_once

    Function Prototype:

    @@ -7526,7 +7303,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.53 pthread_kill

    +

    2.8.53 pthread_kill

    Function Prototype:

    @@ -7588,7 +7365,7 @@ interface of the same name. POSIX Compatibility: Comparable to the POSIX interface of the same name.

    -

    2.9.54 pthread_sigmask

    +

    2.8.54 pthread_sigmask

    Function Prototype:

    @@ -7647,7 +7424,7 @@ interface of the same name.
    -

    2.10 Environment Variables

     +

    2.9 Environment Variables
    @@ -7679,18 +7456,18 @@ interface of the same name. described in detail in the following paragraphs.

    Disabling Environment Variable Support. All support for environment variables can be disabled by setting CONFIG_DISABLE_ENVIRON in the board configuration file.

    -

    2.10.1 getenv

    +

    2.9.1 getenv

    Function Prototype:

    @@ -7718,7 +7495,7 @@ interface of the same name. The value of the variable (read-only) or NULL on failure.

    -

    2.10.2 putenv

    +

    2.9.2 putenv

    Function Prototype:

    @@ -7749,7 +7526,7 @@ interface of the same name. Zero on success.

    -

    2.10.3 clearenv

    +

    2.9.3 clearenv

    Function Prototype:

    @@ -7771,7 +7548,7 @@ interface of the same name. Zero on success.

    -

    2.10.4 setenv

    +

    2.9.4 setenv

    Function Prototype:

    @@ -7809,7 +7586,7 @@ interface of the same name. Zero on success.

    -

    2.10.5 unsetenv

    +

    2.9.5 unsetenv

    Function Prototype:

    @@ -7839,24 +7616,24 @@ interface of the same name.
    -

    2.11 File System Interfaces

     +

    2.10 File System Interfaces
    -

    2.11.1 NuttX File System Overview

    +

    2.10.1 NuttX File System Overview

    Overview. NuttX includes an optional, scalable file system. @@ -7916,23 +7693,23 @@ interface of the same name. in a file-system-like name space.

    -

    2.11.2 Driver Operations

    +

    2.10.2 Driver Operations

    -

    2.11.2.1 fcntl.h

    +

    2.10.2.1 fcntl.h

         #include <fcntl.h>
   int open(const char *path, int oflag, ...);
    -

    2.11.2.2 unistd.h

    +

    2.10.2.2 unistd.h

         #include <unistd.h>
@@ -7945,16 +7722,16 @@ interface of the same name.
   ssize_t write(int fd, const void *buf, size_t nbytes);
    -

    2.11.2.3 sys/ioctl.h

    +

    2.10.2.3 sys/ioctl.h

         #include <sys/ioctl.h>
   int     ioctl(int fd, int req, unsigned long arg);
    -

    2.11.2.4 poll.h

    +

    2.10.2.4 poll.h

    -
    2.11.2.4.1 poll
    +
    2.10.2.4.1 poll

    Function Prototype:

    @@ -8024,9 +7801,9 @@ interface of the same name.
  • ENOSYS. One or more of the drivers supporting the file descriptor does not support the poll method.
    • -

    2.11.2.5 sys/select.h

    +

    2.10.2.5 sys/select.h

    -
    2.11.2.5.1 select
    +
    2.10.2.5.1 select

    Function Prototype:

    @@ -8070,7 +7847,7 @@ int select(int nfds, FAR fd_set *readfds, FAR fd_set *writefds, see poll()). -

    2.11.3 Directory Operations

    +

    2.10.3 Directory Operations

       #include <dirent.h>
@@ -8085,7 +7862,7 @@ int        telldir(FAR DIR *dirp);
    -

    2.11.4 UNIX Standard Operations

    +

    2.10.4 UNIX Standard Operations

       #include <unistd.h>
 
@@ -8121,7 +7898,7 @@ int     getopt(int argc, FAR char *const argv[], FAR const char *optstring);
    -

    2.11.5 Standard I/O

    +

    2.10.5 Standard I/O

       #include <stdio.h>
 
@@ -8183,7 +7960,7 @@ int statfs(const char *path, struct statfs *buf);
 int fstatfs(int fd, struct statfs *buf);
    -

    2.11.6 Standard String Operations

    +

    2.10.6 Standard String Operations

       #include <string.h>
 
@@ -8217,9 +7994,9 @@ void  *memmove(void *dest, const void *src, size_t count);
 # define bzero(s,n) (void)memset(s,0,n)
    -

    2.11.7 Pipes and FIFOs

    +

    2.10.7 Pipes and FIFOs

    -

    2.11.7.1 pipe

    +

    2.10.7.1 pipe

    Function Prototype:

    @@ -8253,7 +8030,7 @@ int pipe(int fd[2]);

    -

    2.11.7.2 mkfifo

    +

    2.10.7.2 mkfifo

    Function Prototype:

    @@ -8300,8 +8077,8 @@ int mkfifo(FAR const char *pathname, mode_t mode);

    -

    2.11.8 FAT File System Support

    -

    2.11.8.1 mkfatfs

    +

    2.10.8 FAT File System Support

    +

    2.10.8.1 mkfatfs

    Function Prototype:

    @@ -8378,7 +8155,7 @@ struct fat_format_s

    -

    2.11.9 mmap() and eXecute In Place (XIP)

    +

    2.10.9 mmap() and eXecute In Place (XIP)

    NuttX operates in a flat open address space and is focused on MCUs that do support Memory Management Units (MMUs). Therefore, NuttX generally does not @@ -8507,7 +8284,7 @@ struct fat_format_s -

    2.11.9.1 mmap

    +

    2.10.9.1 mmap

    Function Prototype:

    @@ -8637,7 +8414,7 @@ FAR void *mmap(FAR void *start, size_t length, int prot, int flags, int fd, off_
    -

    2.12 Network Interfaces

     +

    2.11 Network Interfaces
    @@ -8650,20 +8427,20 @@ Those socket APIs are discussed in the following paragraphs.

    -

    2.12.1 socket

    +

    2.11.1 socket

    Function Prototype:

    @@ -8705,7 +8482,7 @@ int socket(int domain, int type, int protocol); The protocol type or the specified protocol is not supported within this domain. -

    2.12.2 bind

    +

    2.11.2 bind

    Function Prototype:

    @@ -8747,7 +8524,7 @@ int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen); sockfd is a descriptor for a file, not a socket. -

    2.12.3 connect

    +

    2.11.3 connect

    Function Prototype:

    @@ -8826,7 +8603,7 @@ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen); to accept new connections. -

    2.12.4 listen

    +

    2.11.4 listen

    Function Prototype:

    @@ -8864,7 +8641,7 @@ int listen(int sockfd, int backlog);
  • EOPNOTSUPP: The socket is not of a type that supports the listen operation.
    • -

    2.12.5 accept

    +

    2.11.5 accept

    Function Prototype:

    @@ -8942,7 +8719,7 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen); Firewall rules forbid connection. -

    2.12.6 send

    +

    2.11.6 send

    Function Prototype:

    @@ -8974,7 +8751,7 @@ ssize_t send(int sockfd, const void *buf, size_t len, int flags); See sendto().

    -

    2.12.7 sendto

    +

    2.11.7 sendto

    Function Prototype:

    @@ -9047,7 +8824,7 @@ ssize_t send(int sockfd, const void *buf, size_t len, int flags); MSG_NOSIGNAL is set. -

    2.12.8 recv

    +

    2.11.8 recv

    Function Prototype:

    @@ -9077,7 +8854,7 @@ ssize_t recv(int sockfd, void *buf, size_t len, int flags); See recvfrom().

    -

    2.12.9 recvfrom

    +

    2.11.9 recvfrom

    Function Prototype:

    @@ -9140,7 +8917,7 @@ ssize_t recvfrom(int sockfd, void *buf, size_t len, int flags, The argument sockfd does not refer to a socket. -

    2.12.10 setsockopt

    +

    2.11.10 setsockopt

    Function Prototype:

    @@ -9200,7 +8977,7 @@ int setsockopt(int sockfd, int level, int option, Insufficient resources are available in the system to complete the call. -

    2.12.11 getsockopt

    +

    2.11.11 getsockopt

    Function Prototype:

    @@ -9593,10 +9370,10 @@ notify a task when a message is available on a queue.
  • pipe
  • poll
  • poll.h
    • -
  • posix_spawn
    • -
  • posix_spawn_file_actions_addclose
    • +
  • posix_spawn
    • +
  • posix_spawn_file_actions_addclose
  • posix_spawn_file_actions_adddup2
  • posix_spawn_file_actions_addopen
  • posix_spawn_file_actions_destroy
    • @@ -9677,12 +9454,12 @@ notify a task when a message is available on a queue.
  • recv
  • recvfrom
  • rename
    • + +
  • rmdir
  • rewinddir
  • ROM disk driver
  • ROMFS
    • - -
  • sched_getparam
  • sched_get_priority_max
  • sched_get_priority_min
    • @@ -9759,12 +9536,6 @@ notify a task when a message is available on a queue.
  • wait
  • waitid
  • waitpid -
  • Watchdog Timer Interfaces -
  • wd_cancel
    • -
  • wd_create
    • -
  • wd_delete
    • -
  • wd_gettime
    • -
  • wd_start
  • write
  • XIP
    • diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index 36b79a9d3..12a15eee7 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -51,12 +51,12 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c index 8b46150a1..096d3fbd0 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/kinetis_enet.c * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -46,11 +46,11 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c b/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c index 6ff5092e5..ef284bce5 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_sdhc.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/kinetis/kinetis_sdhc.c * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,9 +45,9 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_emc.c b/nuttx/arch/arm/src/lpc17xx/lpc17_emc.c index dceac78bd..c9773fad6 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_emc.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_emc.c @@ -1,6 +1,5 @@ /**************************************************************************** * arch/arm/src/lpc17/lpc17_emc.c - * arch/arm/src/chip/lpc17_emc.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index 94ab11b56..46c857ed2 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -45,11 +45,11 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c b/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c index c4c5917ed..47a2788c1 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_i2c.c @@ -53,10 +53,10 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c index d5b143118..25b0c47c9 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/lpc17xx/lpc17_sdcard.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,9 +45,9 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c b/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c index 2299eb841..cffd08116 100644 --- a/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c +++ b/nuttx/arch/arm/src/lpc2378/lpc23xx_i2c.c @@ -61,12 +61,12 @@ #include #include +#include #include #include #include -#include "wdog.h" #include "chip.h" #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/lpc31xx/lpc31_i2c.c b/nuttx/arch/arm/src/lpc31xx/lpc31_i2c.c index 73b9ab720..a62572ea3 100644 --- a/nuttx/arch/arm/src/lpc31xx/lpc31_i2c.c +++ b/nuttx/arch/arm/src/lpc31xx/lpc31_i2c.c @@ -3,7 +3,7 @@ * * Author: David Hewson * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -50,12 +50,12 @@ #include #include +#include #include #include #include -#include "wdog.h" #include "chip.h" #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c b/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c index 5ba665ccf..34986f8ec 100644 --- a/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c +++ b/nuttx/arch/arm/src/lpc43xx/lpc43_i2c.c @@ -1,7 +1,7 @@ /******************************************************************************* * arch/arm/src/lpc43xx/lpc43_i2c.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Ported from from the LPC17 version: @@ -61,12 +61,12 @@ #include #include +#include #include #include #include -#include "wdog.h" #include "chip.h" #include "up_arch.h" #include "up_internal.h" diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c index 0e65511e5..4805aa93d 100644 --- a/nuttx/arch/arm/src/sam34/sam_emac.c +++ b/nuttx/arch/arm/src/sam34/sam_emac.c @@ -55,14 +55,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sam34/sam_hsmci.c b/nuttx/arch/arm/src/sam34/sam_hsmci.c index d770b2d2b..c23b72445 100644 --- a/nuttx/arch/arm/src/sam34/sam_hsmci.c +++ b/nuttx/arch/arm/src/sam34/sam_hsmci.c @@ -45,11 +45,11 @@ #include #include #include -#include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sam34/sam_spi.c b/nuttx/arch/arm/src/sam34/sam_spi.c index 81c73a76f..fb1ab4958 100644 --- a/nuttx/arch/arm/src/sam34/sam_spi.c +++ b/nuttx/arch/arm/src/sam34/sam_spi.c @@ -46,13 +46,14 @@ #include #include #include -#include #include #include #include #include + #include +#include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c index 3dfc0d07e..4a8555ef5 100644 --- a/nuttx/arch/arm/src/sama5/sam_emaca.c +++ b/nuttx/arch/arm/src/sama5/sam_emaca.c @@ -56,7 +56,6 @@ #include #include #include -#include #include #include @@ -64,6 +63,7 @@ #include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c index 905eb1a5d..fb81624ad 100644 --- a/nuttx/arch/arm/src/sama5/sam_emacb.c +++ b/nuttx/arch/arm/src/sama5/sam_emacb.c @@ -70,14 +70,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c index 89a47ff80..7ee3d727b 100644 --- a/nuttx/arch/arm/src/sama5/sam_gmac.c +++ b/nuttx/arch/arm/src/sama5/sam_gmac.c @@ -53,14 +53,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_hsmci.c b/nuttx/arch/arm/src/sama5/sam_hsmci.c index 670c3a69f..c1a7e92d3 100644 --- a/nuttx/arch/arm/src/sama5/sam_hsmci.c +++ b/nuttx/arch/arm/src/sama5/sam_hsmci.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/sama5/sam_hsmci.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,11 +45,11 @@ #include #include #include -#include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_spi.c b/nuttx/arch/arm/src/sama5/sam_spi.c index 3a1a4652a..5b4a6d15f 100644 --- a/nuttx/arch/arm/src/sama5/sam_spi.c +++ b/nuttx/arch/arm/src/sama5/sam_spi.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/sama5/sam_spi.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * * This derives from SAM3/4 SPI driver: @@ -50,13 +50,14 @@ #include #include #include -#include #include #include #include #include + #include +#include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_ssc.c b/nuttx/arch/arm/src/sama5/sam_ssc.c index 570b85078..ae9859648 100644 --- a/nuttx/arch/arm/src/sama5/sam_ssc.c +++ b/nuttx/arch/arm/src/sama5/sam_ssc.c @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -55,6 +54,7 @@ #include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_tsd.c b/nuttx/arch/arm/src/sama5/sam_tsd.c index fe73afc3d..fd9d55f7a 100644 --- a/nuttx/arch/arm/src/sama5/sam_tsd.c +++ b/nuttx/arch/arm/src/sama5/sam_tsd.c @@ -57,12 +57,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/nuttx/arch/arm/src/sama5/sam_twi.c b/nuttx/arch/arm/src/sama5/sam_twi.c index eec19f6e6..b53746c09 100644 --- a/nuttx/arch/arm/src/sama5/sam_twi.c +++ b/nuttx/arch/arm/src/sama5/sam_twi.c @@ -1,7 +1,7 @@ /******************************************************************************* * arch/arm/src/sama5/sam_twi.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -52,10 +52,10 @@ #include #include #include -#include #include #include +#include #include #include diff --git a/nuttx/arch/arm/src/samd/sam_spi.c b/nuttx/arch/arm/src/samd/sam_spi.c index 9c9bf522a..34763c49c 100644 --- a/nuttx/arch/arm/src/samd/sam_spi.c +++ b/nuttx/arch/arm/src/samd/sam_spi.c @@ -49,12 +49,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index a4d894fc8..729e034f5 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/stm32/stm32_eth.c * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,14 +45,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include diff --git a/nuttx/arch/arm/src/stm32/stm32_sdio.c b/nuttx/arch/arm/src/stm32/stm32_sdio.c index cc164bc80..4cdfe69eb 100644 --- a/nuttx/arch/arm/src/stm32/stm32_sdio.c +++ b/nuttx/arch/arm/src/stm32/stm32_sdio.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/stm32/stm32_sdio.c * - * Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2011-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,11 +45,11 @@ #include #include #include -#include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c index 48cc02324..a235fe0c1 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c @@ -45,13 +45,13 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index b65876010..023bc922b 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/m9s12_ethernet.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,13 +45,13 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index ecc9e1697..eeaf3ad5c 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/pic32mx/pic32mx_ethernet.c * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * This driver derives from the PIC32MX Ethernet Driver @@ -47,14 +47,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c index 748ab01a7..c8f9326b6 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/mips/src/pic32mx/pic32mx_usbdev.c * - * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -53,10 +53,10 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index 7f0ba5757..baaa953cf 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/ez80_emac.c * - * Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2010, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -48,14 +48,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index d1eb29ba6..3dc9c87c5 100644 --- a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch @@ -157,10 +157,10 @@ index c78362f..207f9b9 100644 +int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...); #endif /* __APPS_NSHLIB_NSH_CONSOLE_H */ -diff --git a/nuttx/include/wdog.h b/nuttx/include/wdog.h +diff --git a/nuttx/include/wdog.h b/nuttx/include/nuttx/wdog.h index 0aa3584..ac4a36a 100644 ---- a/nuttx/include/wdog.h -+++ b/nuttx/include/wdog.h +--- a/nuttx/include/nuttx/wdog.h ++++ b/nuttx/include/nuttx/wdog.h @@ -74,7 +74,23 @@ typedef union wdparm_u wdparm_t; * watchdog function expires. Up to four parameters may be passed. */ diff --git a/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index d1eb29ba6..3dc9c87c5 100644 --- a/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/nuttx/configs/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch @@ -157,10 +157,10 @@ index c78362f..207f9b9 100644 +int nsh_output(FAR struct nsh_vtbl_s *vtbl, FAR const char *fmt, ...); #endif /* __APPS_NSHLIB_NSH_CONSOLE_H */ -diff --git a/nuttx/include/wdog.h b/nuttx/include/wdog.h +diff --git a/nuttx/include/wdog.h b/nuttx/include/nuttx/wdog.h index 0aa3584..ac4a36a 100644 ---- a/nuttx/include/wdog.h -+++ b/nuttx/include/wdog.h +--- a/nuttx/include/nuttx/wdog.h ++++ b/nuttx/include/nuttx/wdog.h @@ -74,7 +74,23 @@ typedef union wdparm_u wdparm_t; * watchdog function expires. Up to four parameters may be passed. */ diff --git a/nuttx/drivers/input/ads7843e.c b/nuttx/drivers/input/ads7843e.c index 4fd2f43a6..aba8bb323 100644 --- a/nuttx/drivers/input/ads7843e.c +++ b/nuttx/drivers/input/ads7843e.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/input/ads7843e.c * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * Diego Sanchez * @@ -59,13 +59,13 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/drivers/input/ads7843e.h b/nuttx/drivers/input/ads7843e.h index 97c45d042..902c386c7 100644 --- a/nuttx/drivers/input/ads7843e.h +++ b/nuttx/drivers/input/ads7843e.h @@ -1,7 +1,7 @@ /******************************************************************************************** * drivers/input/ads7843e.h * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -55,11 +55,11 @@ #include #include #include -#include #include -#include +#include #include +#include #include /******************************************************************************************** diff --git a/nuttx/drivers/input/max11802.c b/nuttx/drivers/input/max11802.c index 8df6690f0..5b50281ef 100644 --- a/nuttx/drivers/input/max11802.c +++ b/nuttx/drivers/input/max11802.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/input/max11802.c * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * Petteri Aimonen * @@ -53,16 +53,16 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include +#include #include #include -#include #include #include diff --git a/nuttx/drivers/input/max11802.h b/nuttx/drivers/input/max11802.h index 8a6da0468..15a568603 100644 --- a/nuttx/drivers/input/max11802.h +++ b/nuttx/drivers/input/max11802.h @@ -1,7 +1,7 @@ /******************************************************************************************** * drivers/input/max11802.h * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * Petteri Aimonen * @@ -50,11 +50,11 @@ #include #include #include -#include #include -#include +#include #include +#include #include /******************************************************************************************** diff --git a/nuttx/drivers/input/stmpe811.h b/nuttx/drivers/input/stmpe811.h index fb686ee44..b219409a8 100644 --- a/nuttx/drivers/input/stmpe811.h +++ b/nuttx/drivers/input/stmpe811.h @@ -1,7 +1,7 @@ /******************************************************************************************** * drivers/input/stmpe811.h * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -46,9 +46,9 @@ #include -#include #include +#include #include #include #include diff --git a/nuttx/drivers/net/cs89x0.c b/nuttx/drivers/net/cs89x0.c index 6af54d7b0..9e386af49 100644 --- a/nuttx/drivers/net/cs89x0.c +++ b/nuttx/drivers/net/cs89x0.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/cs89x0.c * - * Copyright (C) 2009-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,13 +45,13 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include diff --git a/nuttx/drivers/net/dm90x0.c b/nuttx/drivers/net/dm90x0.c index ce2753287..80885b49e 100644 --- a/nuttx/drivers/net/dm90x0.c +++ b/nuttx/drivers/net/dm90x0.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/dm9x.c * - * Copyright (C) 2007-2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2010, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: Davicom data sheets (DM9000-DS-F03-041906.pdf, @@ -57,14 +57,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include diff --git a/nuttx/drivers/net/e1000.c b/nuttx/drivers/net/e1000.c index 21a58d2e3..d109f0d4f 100644 --- a/nuttx/drivers/net/e1000.c +++ b/nuttx/drivers/net/e1000.c @@ -6,7 +6,7 @@ * * This file is a part of NuttX: * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -47,13 +47,13 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/drivers/net/enc28j60.c b/nuttx/drivers/net/enc28j60.c index e0a1f207d..1a87420f8 100644 --- a/nuttx/drivers/net/enc28j60.c +++ b/nuttx/drivers/net/enc28j60.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/enc28j60.c * - * Copyright (C) 2010-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * References: @@ -51,13 +51,13 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/drivers/net/encx24j600.c b/nuttx/drivers/net/encx24j600.c index 45eca23e9..585054dde 100644 --- a/nuttx/drivers/net/encx24j600.c +++ b/nuttx/drivers/net/encx24j600.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/net/encx24j600.c * - * Copyright (C) 2013-1014 UVC Ingenieure. All rights reserved. + * Copyright (C) 2013-2014 UVC Ingenieure. All rights reserved. * Author: Max Holtzberg * * References: @@ -56,14 +56,14 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include #include #include diff --git a/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c index fe28be603..ae9358f91 100644 --- a/nuttx/drivers/net/skeleton.c +++ b/nuttx/drivers/net/skeleton.c @@ -45,13 +45,13 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include diff --git a/nuttx/drivers/net/vnet.c b/nuttx/drivers/net/vnet.c index f0d7af8f2..bda4c62c9 100644 --- a/nuttx/drivers/net/vnet.c +++ b/nuttx/drivers/net/vnet.c @@ -6,7 +6,7 @@ * * This file is a part of NuttX: * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -49,13 +49,13 @@ #include #include #include -#include #include #include -#include #include +#include +#include #include #include diff --git a/nuttx/fs/fs_automount.c b/nuttx/fs/fs_automount.c index 9074d4159..5e35f0b68 100644 --- a/nuttx/fs/fs_automount.c +++ b/nuttx/fs/fs_automount.c @@ -46,11 +46,11 @@ #include #include -#include #include #include #include +#include #include #include #include diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c index 5f4e1dd5f..b3ec6c63e 100644 --- a/nuttx/fs/fs_poll.c +++ b/nuttx/fs/fs_poll.c @@ -1,7 +1,7 @@ /**************************************************************************** * fs/fs_poll.c * - * Copyright (C) 2008-2009, 2012-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009, 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,14 +42,14 @@ #include #include #include -#include #include #include #include -#include +#include #include #include +#include #include "fs_internal.h" diff --git a/nuttx/include/nuttx/net/cs89x0.h b/nuttx/include/nuttx/net/cs89x0.h index f12b364c4..71a628c57 100644 --- a/nuttx/include/nuttx/net/cs89x0.h +++ b/nuttx/include/nuttx/net/cs89x0.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/nuttx/net/cs89x0.h * - * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2012, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,8 @@ #include #include -#include + +#include /**************************************************************************** * Public Types diff --git a/nuttx/include/nuttx/wdog.h b/nuttx/include/nuttx/wdog.h new file mode 100644 index 000000000..84cb633ba --- /dev/null +++ b/nuttx/include/nuttx/wdog.h @@ -0,0 +1,110 @@ +/**************************************************************************** + * include/nuttx/wdog.h + * + * Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 __INCLUDE_NUTTX_WDOG_H +#define __INCLUDE_NUTTX_WDOG_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Type Declarations + ****************************************************************************/ + +/* The arguments are passed as uint32_t values. For systems where the + * sizeof(pointer) < sizeof(uint32_t), the following union defines the + * alignment of the pointer within the uint32_t. For example, the SDCC + * MCS51 general pointer is 24-bits, but uint32_t is 32-bits (of course). + * + * For systems where sizeof(pointer) > sizeof(uint32_t), we will have to do + * some redesign. + */ + +union wdparm_u +{ + FAR void *pvarg; + FAR uint32_t *dwarg; +}; + +typedef union wdparm_u wdparm_t; + +/* This is the form of the function that is called when the + * watchdog function expires. Up to four parameters may be passed. + */ + +typedef CODE void (*wdentry_t)(int argc, uint32_t arg1, ...); + +/* Watchdog 'handle' */ + +typedef FAR struct wdog_s *WDOG_ID; + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Pubic Function Prototypes + ****************************************************************************/ + +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +WDOG_ID wd_create(void); +int wd_delete(WDOG_ID wdog); +int wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry, int argc, ...); +int wd_cancel(WDOG_ID wdog); +int wd_gettime(WDOG_ID wdog); + +#undef EXTERN +#ifdef __cplusplus +} +#endif + +#endif /* _WDOG_H_ */ diff --git a/nuttx/include/wdog.h b/nuttx/include/wdog.h deleted file mode 100644 index 0aa358416..000000000 --- a/nuttx/include/wdog.h +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** - * include/wdog.h - * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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 __INCLUDE_WDOG_H -#define __INCLUDE_WDOG_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * Global Type Declarations - ****************************************************************************/ - -/* The arguments are passed as uint32_t values. For systems where the - * sizeof(pointer) < sizeof(uint32_t), the following union defines the - * alignment of the pointer within the uint32_t. For example, the SDCC - * MCS51 general pointer is 24-bits, but uint32_t is 32-bits (of course). - * - * For systems where sizeof(pointer) > sizeof(uint32_t), we will have to do - * some redesign. - */ - -union wdparm_u -{ - FAR void *pvarg; - FAR uint32_t *dwarg; -}; - -typedef union wdparm_u wdparm_t; - -/* This is the form of the function that is called when the - * watchdog function expires. Up to four parameters may be passed. - */ - -typedef CODE void (*wdentry_t)(int argc, uint32_t arg1, ...); - -/* Watchdog 'handle' */ - -typedef FAR struct wdog_s *WDOG_ID; - -/**************************************************************************** - * Global Variables - ****************************************************************************/ - -/**************************************************************************** - * Global Function Prototypes - ****************************************************************************/ - -#ifdef __cplusplus -#define EXTERN extern "C" -extern "C" -{ -#else -#define EXTERN extern -#endif - -WDOG_ID wd_create(void); -int wd_delete(WDOG_ID wdog); -int wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry, int argc, ...); -int wd_cancel(WDOG_ID wdog); -int wd_gettime(WDOG_ID wdog); - -#undef EXTERN -#ifdef __cplusplus -} -#endif - -#endif /* _WDOG_H_ */ diff --git a/nuttx/net/arp/arp_timer.c b/nuttx/net/arp/arp_timer.c index 146abbfb9..c1b23c4bc 100644 --- a/nuttx/net/arp/arp_timer.c +++ b/nuttx/net/arp/arp_timer.c @@ -42,9 +42,9 @@ #include #include -#include #include +#include #include #include diff --git a/nuttx/net/igmp/igmp_group.c b/nuttx/net/igmp/igmp_group.c index 0d70c10b1..fba472757 100644 --- a/nuttx/net/igmp/igmp_group.c +++ b/nuttx/net/igmp/igmp_group.c @@ -2,7 +2,7 @@ * net/igmp/igmp_group.c * IGMP group data structure management logic * - * Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * The NuttX implementation of IGMP was inspired by the IGMP add-on for the @@ -47,14 +47,14 @@ #include #include -#include #include #include #include + #include +#include #include - #include #include #include diff --git a/nuttx/net/igmp/igmp_input.c b/nuttx/net/igmp/igmp_input.c index 93087b07e..04ec4709c 100644 --- a/nuttx/net/igmp/igmp_input.c +++ b/nuttx/net/igmp/igmp_input.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/igmp/igmp_input.c * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * The NuttX implementation of IGMP was inspired by the IGMP add-on for the @@ -43,10 +43,10 @@ #include -#include #include #include +#include #include #include #include diff --git a/nuttx/net/igmp/igmp_leave.c b/nuttx/net/igmp/igmp_leave.c index 50742a18f..521a437e4 100644 --- a/nuttx/net/igmp/igmp_leave.c +++ b/nuttx/net/igmp/igmp_leave.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/igmp/igmp_leave.c * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * The NuttX implementation of IGMP was inspired by the IGMP add-on for the @@ -43,12 +43,12 @@ #include -#include #include #include #include +#include #include #include #include diff --git a/nuttx/net/igmp/igmp_timer.c b/nuttx/net/igmp/igmp_timer.c index b257204c4..5465a68f7 100644 --- a/nuttx/net/igmp/igmp_timer.c +++ b/nuttx/net/igmp/igmp_timer.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/igmp/igmp_timer.c * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * The NuttX implementation of IGMP was inspired by the IGMP add-on for the @@ -44,10 +44,10 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/nuttx/sched/mqueue/mq_timedreceive.c b/nuttx/sched/mqueue/mq_timedreceive.c index a0fc97860..d80304464 100644 --- a/nuttx/sched/mqueue/mq_timedreceive.c +++ b/nuttx/sched/mqueue/mq_timedreceive.c @@ -1,7 +1,7 @@ /**************************************************************************** * sched/mqueue/mq_timedreceive.c * - * Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -45,10 +45,10 @@ #include #include #include -#include #include #include +#include #include "sched/sched.h" #include "clock/clock.h" diff --git a/nuttx/sched/mqueue/mq_timedsend.c b/nuttx/sched/mqueue/mq_timedsend.c index d78b720b7..84d05db06 100644 --- a/nuttx/sched/mqueue/mq_timedsend.c +++ b/nuttx/sched/mqueue/mq_timedsend.c @@ -1,7 +1,7 @@ /**************************************************************************** * sched/mqueue/mq_timedsend.c * - * Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,10 +44,11 @@ #include #include #include -#include #include #include + #include +#include #include "clock/clock.h" #include "sched/sched.h" diff --git a/nuttx/sched/pthread/pthread_condtimedwait.c b/nuttx/sched/pthread/pthread_condtimedwait.c index 4505225b2..766f9bbcd 100644 --- a/nuttx/sched/pthread/pthread_condtimedwait.c +++ b/nuttx/sched/pthread/pthread_condtimedwait.c @@ -1,7 +1,7 @@ /**************************************************************************** * sched/pthread/pthread_condtimedwait.c * - * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -47,9 +47,10 @@ #include #include #include -#include #include +#include + #include "sched/sched.h" #include "pthread/pthread.h" #include "clock/clock.h" diff --git a/nuttx/sched/semaphore/sem_timedwait.c b/nuttx/sched/semaphore/sem_timedwait.c index f5053bdf8..1ac69e68b 100644 --- a/nuttx/sched/semaphore/sem_timedwait.c +++ b/nuttx/sched/semaphore/sem_timedwait.c @@ -1,7 +1,7 @@ /**************************************************************************** * sched/semaphore/sem_timedwait.c * - * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,10 +44,10 @@ #include #include #include -#include #include #include +#include #include "sched/sched.h" #include "clock/clock.h" diff --git a/nuttx/sched/signal/sig_procmask.c b/nuttx/sched/signal/sig_procmask.c index c56fdf5aa..861c41047 100644 --- a/nuttx/sched/signal/sig_procmask.c +++ b/nuttx/sched/signal/sig_procmask.c @@ -1,7 +1,7 @@ /**************************************************************************** * sched/signal/sig_procmask.c * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,12 +42,13 @@ #include #include #include -#include #include #include #include -#include + #include +#include +#include #include "sched/sched.h" #include "signal/signal.h" diff --git a/nuttx/sched/signal/sig_releasependingsignal.c b/nuttx/sched/signal/sig_releasependingsignal.c index f97009807..17a52eeba 100644 --- a/nuttx/sched/signal/sig_releasependingsignal.c +++ b/nuttx/sched/signal/sig_releasependingsignal.c @@ -1,7 +1,7 @@ /************************************************************************ * sched/signal/sig_releasependingsignal.c * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,13 +42,13 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include "signal/signal.h" diff --git a/nuttx/sched/signal/sig_removependingsignal.c b/nuttx/sched/signal/sig_removependingsignal.c index 37d7239d2..b34cc6c82 100644 --- a/nuttx/sched/signal/sig_removependingsignal.c +++ b/nuttx/sched/signal/sig_removependingsignal.c @@ -1,7 +1,7 @@ /************************************************************************ * sched/signal/sig_removependingsignal.c * - * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -42,13 +42,13 @@ #include #include #include -#include #include #include #include -#include #include +#include +#include #include "signal/signal.h" diff --git a/nuttx/sched/signal/sig_timedwait.c b/nuttx/sched/signal/sig_timedwait.c index e592f8e2e..66d4ccd05 100644 --- a/nuttx/sched/signal/sig_timedwait.c +++ b/nuttx/sched/signal/sig_timedwait.c @@ -1,7 +1,7 @@ /**************************************************************************** * sched/signal/sig_timedwait.c * - * Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,13 +44,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include "sched/sched.h" #include "signal/signal.h" diff --git a/nuttx/sched/task/task_recover.c b/nuttx/sched/task/task_recover.c index 00085cd29..797a75605 100644 --- a/nuttx/sched/task/task_recover.c +++ b/nuttx/sched/task/task_recover.c @@ -1,7 +1,7 @@ /**************************************************************************** * sched/task/task_recover.c * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -39,9 +39,8 @@ #include -#include - #include +#include #include #include "mqueue/mqueue.h" diff --git a/nuttx/sched/timer/timer.h b/nuttx/sched/timer/timer.h index 4ecbe7973..53a5ed349 100644 --- a/nuttx/sched/timer/timer.h +++ b/nuttx/sched/timer/timer.h @@ -1,7 +1,7 @@ /******************************************************************************** * sched/timer/timer.h * - * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -44,9 +44,9 @@ #include #include -#include #include +#include /******************************************************************************** * Definitions diff --git a/nuttx/sched/timer/timer_create.c b/nuttx/sched/timer/timer_create.c index 7b68cee84..71a83546f 100644 --- a/nuttx/sched/timer/timer_create.c +++ b/nuttx/sched/timer/timer_create.c @@ -1,7 +1,7 @@ /******************************************************************************** * sched/timer/timer_create.c * - * Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,9 +43,9 @@ #include #include #include -#include #include +#include #include #include "timer/timer.h" diff --git a/nuttx/sched/wdog/wd_cancel.c b/nuttx/sched/wdog/wd_cancel.c index 44fc95ab4..9749eccb6 100644 --- a/nuttx/sched/wdog/wd_cancel.c +++ b/nuttx/sched/wdog/wd_cancel.c @@ -41,8 +41,9 @@ #include #include -#include + #include +#include #include "sched/sched.h" #include "wdog/wdog.h" diff --git a/nuttx/sched/wdog/wd_create.c b/nuttx/sched/wdog/wd_create.c index fb57d86b1..2e71ceac7 100644 --- a/nuttx/sched/wdog/wd_create.c +++ b/nuttx/sched/wdog/wd_create.c @@ -40,10 +40,10 @@ #include #include -#include #include #include +#include #include #include "wdog/wdog.h" diff --git a/nuttx/sched/wdog/wd_delete.c b/nuttx/sched/wdog/wd_delete.c index a98caa20e..b13ed427e 100644 --- a/nuttx/sched/wdog/wd_delete.c +++ b/nuttx/sched/wdog/wd_delete.c @@ -39,12 +39,12 @@ #include -#include #include #include #include #include +#include #include #include "wdog/wdog.h" diff --git a/nuttx/sched/wdog/wd_gettime.c b/nuttx/sched/wdog/wd_gettime.c index 4f69bfeb9..e9d85d077 100644 --- a/nuttx/sched/wdog/wd_gettime.c +++ b/nuttx/sched/wdog/wd_gettime.c @@ -39,7 +39,7 @@ #include -#include +#include #include "wdog/wdog.h" diff --git a/nuttx/sched/wdog/wd_start.c b/nuttx/sched/wdog/wd_start.c index 009a5d5ee..608b1445c 100644 --- a/nuttx/sched/wdog/wd_start.c +++ b/nuttx/sched/wdog/wd_start.c @@ -42,13 +42,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include "sched/sched.h" #include "wdog/wdog.h" diff --git a/nuttx/sched/wdog/wdog.h b/nuttx/sched/wdog/wdog.h index 73a73f1ad..63d0d1584 100644 --- a/nuttx/sched/wdog/wdog.h +++ b/nuttx/sched/wdog/wdog.h @@ -44,9 +44,9 @@ #include #include -#include #include +#include /************************************************************************ * Pre-processor Definitions -- cgit v1.2.3