Put timer_release in a separate file

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@768 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 1 insertions, 86 deletions

diff --git a/nuttx/sched/timer_delete.c b/nuttx/sched/timer_delete.c
index 662455f01..d4a24fca3 100644
--- a/nuttx/sched/timer_delete.c
+++ b/nuttx/sched/timer_delete.c
@@ -39,9 +39,8 @@
 
 #include <nuttx/config.h>
 #include <time.h>
-#include <queue.h>
 #include <errno.h>
-#include <nuttx/kmalloc.h>
+
 #include "timer_internal.h"
 
 #ifndef CONFIG_DISABLE_POSIX_TIMERS
@@ -63,94 +62,10 @@
  ********************************************************************************/
 
 /********************************************************************************
- * Function:  timer_free
- *
- * Description:
- *   Remove the timer from the allocated timer list and free it or return it to
- *   the free list (depending on whether or not the timer is one of the
- *   preallocated timers)
- *
- ********************************************************************************/
-
-static inline void timer_free(struct posix_timer_s *timer)
-{
-  irqstate_t flags;
-
-  /* Remove the timer from the allocated list */
-
-  flags = irqsave();
-  sq_rem((FAR sq_entry_t*)timer, (sq_queue_t*)&g_alloctimers);
-
-  /* Return it to the free list if it is one of the preallocated timers */
-
-#if CONFIG_PREALLOC_TIMERS > 0
-  if ((timer->pt_flags & PT_FLAGS_PREALLOCATED) != 0)
-    {
-      sq_addlast((FAR sq_entry_t*)timer, (FAR sq_queue_t*)&g_freetimers);
-      irqrestore(flags);
-    }
-  else
-#endif
-    {
-      /* Otherwise, return it to the heap */
-
-      irqrestore(flags);
-      sched_free(timer);
-    }
-}
-
-/********************************************************************************
  * Public Functions
  ********************************************************************************/
 
 /********************************************************************************
- * Function:  timer_release
- *
- * Description:
- *   timer_release implements the heart of timer_delete.  It is private to the
- *   the OS internals and differs only in that return value of 1 means that the
- *   timer was not actually deleted.
- *
- * Parameters:
- *   timer - The per-thread timer, previously created by the call to
- *     timer_create(), to be deleted.
- *
- * Return Value:
- *   If the call succeeds, timer_release() will return 0 (OK) or 1 (meaning that
- *   the timer is still valid).  Otherwise, the function will return a negated errno:
- *
- *   -EINVAL - The timer specified timerid is not valid.
- *
- ********************************************************************************/
-
-int timer_release(FAR struct posix_timer_s *timer)
-{
-  /* Some sanity checks */
-
-  if (!timer)
-    {
-      return -EINVAL;
-    }
-
-  if (timer->pt_crefs > 1)
-    {
-      timer->pt_crefs--;
-      return 1;
-    }
-
-  /* Free the underlying watchdog instance (the timer will be canceled by the
-   * watchdog logic before it is actually deleted)
-   */
-
-  (void)wd_delete(timer->pt_wdog);
-
-  /* Release the timer structure */
-
-  timer_free(timer);
-  return OK;
-}
-
-/********************************************************************************
  * Function:  timer_delete
  *
  * Description: