OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move POSIX timer files from sched/ to sched/timer/

This commit is contained in:
Gregory Nutt 2014-08-08 14:55:16 -06:00
parent d4b56eb3cc
commit f8da16a8d3
11 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sched/Makefile
View File

@ -110,11 +110,6 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
TIME_SRCS += nanosleep.c
endif
ifneq ($(CONFIG_DISABLE_POSIX_TIMERS),y)
TIMER_SRCS += timer_initialize.c timer_create.c timer_delete.c timer_getoverrun.c
TIMER_SRCS += timer_gettime.c timer_settime.c timer_release.c
endif
ifeq ($(CONFIG_PAGING),y)
PGFILL_SRCS = pg_miss.c pg_worker.c
endif
@ -127,11 +122,12 @@ include signal/Make.defs
include pthread/Make.defs
include mqueue/Make.defs
include clock/Make.defs
include timer/Make.defs
include environ/Make.defs
CSRCS = $(MISC_SRCS) $(TSK_SRCS) $(SCHED_SRCS)
CSRCS += $(TIME_SRCS) $(TIMER_SRCS) $(PGFILL_SRCS)
CSRCS += $(IRQ_SRCS) $(GRP_SRCS) $(WDOG_SRCS) $(SEM_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(CLOCK_SRCS) $(ENV_SRCS)
CSRCS += $(TIME_SRCS) $(PGFILL_SRCS)
CSRCS += $(IRQ_SRCS) $(GRP_SRCS) $(WDOG_SRCS) $(SEM_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(CLOCK_SRCS) $(TIMER_SRCS) $(ENV_SRCS)
COBJS = $(CSRCS:.c=$(OBJEXT))

2
sched/os_start.c
View File

@ -62,7 +62,7 @@
# include "pthread/pthread.h"
#endif
#include "clock/clock.h"
#include "timer_internal.h"
#include "timer/timer.h"
#include "irq/irq.h"
#ifdef HAVE_TASK_GROUP
#include "group/group.h"

2
sched/sched_releasetcb.c
View File

@ -46,7 +46,7 @@
#include "os_internal.h"
#include "group/group.h"
#include "timer_internal.h"
#include "timer/timer.h"
/************************************************************************
* Private Functions

8
sched/timer_internal.h → sched/timer/timer.h
View File

@ -1,5 +1,5 @@
/********************************************************************************
* timer_internal.h
* sched/timer/timer.h
*
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
********************************************************************************/
#ifndef __SCHED_TIMER_INTERNAL_H
#define __SCHED_TIMER_INTERNAL_H
#ifndef __SCHED_TIMER_TIMER_H
#define __SCHED_TIMER_TIMER_H
/********************************************************************************
* Included Files
@ -99,4 +99,4 @@ void weak_function timer_initialize(void);
void weak_function timer_deleteall(pid_t pid);
int timer_release(FAR struct posix_timer_s *timer);
#endif /* __SCHED_TIMER_INTERNAL_H */
#endif /* __SCHED_TIMER_TIMER_H */

4
sched/timer_create.c → sched/timer/timer_create.c
View File

@ -1,5 +1,5 @@
/********************************************************************************
* sched/timer_create.c
* sched/timer/timer_create.c
*
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -48,7 +48,7 @@
#include <nuttx/kmalloc.h>
#include "timer_internal.h"
#include "timer/timer.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS

4
sched/timer_delete.c → sched/timer/timer_delete.c
View File

@ -1,5 +1,5 @@
/********************************************************************************
* timer_delete.c
* sched/timer/timer_delete.c
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,7 +42,7 @@
#include <time.h>
#include <errno.h>
#include "timer_internal.h"
#include "timer/timer.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS

4
sched/timer_getoverrun.c → sched/timer/timer_getoverrun.c
View File

@ -1,5 +1,5 @@
/********************************************************************************
* timer_getoverrun.c
* sched/timer/timer_getoverrun.c
*
* Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,7 +42,7 @@
#include <time.h>
#include <errno.h>
#include "timer_internal.h"
#include "timer/timer.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS

4
sched/timer_gettime.c → sched/timer/timer_gettime.c
View File

@ -1,5 +1,5 @@
/********************************************************************************
* timer_gettime.c
* sched/timer/timer_gettime.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -43,7 +43,7 @@
#include <errno.h>
#include "clock/clock.h"
#include "timer_internal.h"
#include "timer/timer.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS

4
sched/timer_initialize.c → sched/timer/timer_initialize.c
View File

@ -1,5 +1,5 @@
/********************************************************************************
* timer_initialize.c
* sched/timer/timer_initialize.c
*
* Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -45,7 +45,7 @@
#include <queue.h>
#include <errno.h>
#include "timer_internal.h"
#include "timer/timer.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS

4
sched/timer_release.c → sched/timer/timer_release.c
View File

@ -1,5 +1,5 @@
/********************************************************************************
* timer_release.c
* sched/timer/timer_release.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -44,7 +44,7 @@
#include <nuttx/kmalloc.h>
#include "timer_internal.h"
#include "timer/timer.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS

4
sched/timer_settime.c → sched/timer/timer_settime.c
View File

@ -1,5 +1,5 @@
/********************************************************************************
* sched/timer_settime.c
* sched/timer/timer_settime.c
*
* Copyright (C) 2007-2010, 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -47,7 +47,7 @@
#include "os_internal.h"
#include "clock/clock.h"
#include "signal/signal.h"
#include "timer_internal.h"
#include "timer/timer.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS