diff options
author | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
commit | 88389ea2554c6f56a4fdd86cdd86a1e7b6affc21 (patch) | |
tree | 3ef98ded43e5f3a2cdc30a836a3a7329fe5757bb /nuttx/sched/timer_initialize.c | |
parent | 76346bfe19c816491a6982abfa10f48cd9d258f6 (diff) | |
parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
download | px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.gz px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.bz2 px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.zip |
Merge branch 'master' into new_state_machine
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
Diffstat (limited to 'nuttx/sched/timer_initialize.c')
-rw-r--r-- | nuttx/sched/timer_initialize.c | 168 |
1 files changed, 0 insertions, 168 deletions
diff --git a/nuttx/sched/timer_initialize.c b/nuttx/sched/timer_initialize.c deleted file mode 100644 index 2651469ef..000000000 --- a/nuttx/sched/timer_initialize.c +++ /dev/null @@ -1,168 +0,0 @@ -/******************************************************************************** - * timer_initialize.c - * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <gnutt@nuttx.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ********************************************************************************/ - -/******************************************************************************** - * Included Files - ********************************************************************************/ - -#include <nuttx/config.h> -#include <nuttx/compiler.h> - -#include <sys/types.h> -#include <time.h> -#include <queue.h> -#include <errno.h> - -#include "timer_internal.h" - -#ifndef CONFIG_DISABLE_POSIX_TIMERS - -/******************************************************************************** - * Definitions - ********************************************************************************/ - -/******************************************************************************** - * Private Data - ********************************************************************************/ - -/* These are the preallocated times */ - -#if CONFIG_PREALLOC_TIMERS > 0 -static struct posix_timer_s g_prealloctimers[CONFIG_PREALLOC_TIMERS]; -#endif - -/******************************************************************************** - * Public Data - ********************************************************************************/ - -/* This is a list of free, preallocated timer structures */ - -#if CONFIG_PREALLOC_TIMERS > 0 -volatile sq_queue_t g_freetimers; -#endif - -/* This is a list of instantiated timer structures -- active and inactive. The - * timers are place on this list by timer_create() and removed from the list by - * timer_delete() or when the owning thread exits. - */ - -volatile sq_queue_t g_alloctimers; - -/******************************************************************************** - * Private Functions - ********************************************************************************/ - -/******************************************************************************** - * Public Functions - ********************************************************************************/ - -/******************************************************************************** - * Name: timer_initialize - * - * Description: - * Boot up configuration of the POSIX timer facility. - * - * Parameters: - * None - * - * Return Value: - * None - * - * Assumptions: - * - ********************************************************************************/ - -void weak_function timer_initialize(void) -{ -#if CONFIG_PREALLOC_TIMERS > 0 - int i; - - /* Place all of the pre-allocated timers into the free timer list */ - - sq_init((sq_queue_t*)&g_freetimers); - - for (i = 0; i < CONFIG_PREALLOC_TIMERS; i++) - { - g_prealloctimers[i].pt_flags = PT_FLAGS_PREALLOCATED; - sq_addlast((FAR sq_entry_t*)&g_prealloctimers[i], (FAR sq_queue_t*)&g_freetimers); - } -#endif - - /* Initialize the list of allocated timers */ - - sq_init((sq_queue_t*)&g_alloctimers); -} - -/******************************************************************************** - * Name: timer_deleteall - * - * Description: - * This function is called whenever a thread exits. Any timers owned by that - * thread are deleted as though called by timer_delete(). - * - * It is provided in this file so that it can be weakly defined but also, - * like timer_intitialize(), be brought into the link whenever the timer - * resources are referenced. - * - * Parameters: - * pid - the task ID of the thread that exited - * - * Return Value: - * None - * - * Assumptions: - * - ********************************************************************************/ - -void weak_function timer_deleteall(pid_t pid) -{ - FAR struct posix_timer_s *timer; - FAR struct posix_timer_s *next; - irqstate_t flags; - - flags = irqsave(); - for (timer = (FAR struct posix_timer_s*)g_alloctimers.head; timer; timer = next) - { - next = timer->flink; - if (timer->pt_owner == pid) - { - timer_delete((timer_t)timer); - } - } - - irqrestore(flags); -} - -#endif /* CONFIG_DISABLE_POSIX_TIMERS */ |