diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-08 16:57:47 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-08 16:57:47 -0600 |
commit | 08643db509f3a0683a29368809b8d8a238cd498c (patch) | |
tree | 1c3a2285dbf219ad3b472e002387ae0dc1f5e977 | |
parent | d699ae3cb3e27074dc6c70bb2cebc577ff5db8d4 (diff) | |
download | nuttx-08643db509f3a0683a29368809b8d8a238cd498c.tar.gz nuttx-08643db509f3a0683a29368809b8d8a238cd498c.tar.bz2 nuttx-08643db509f3a0683a29368809b8d8a238cd498c.zip |
Move a few files in sched/ that did not seem to have a home to sched/signal and sched/task
-rw-r--r-- | nuttx/sched/Makefile | 14 | ||||
-rw-r--r-- | nuttx/sched/signal/Make.defs | 2 | ||||
-rw-r--r-- | nuttx/sched/signal/sig_nanosleep.c (renamed from nuttx/sched/nanosleep.c) | 2 | ||||
-rw-r--r-- | nuttx/sched/task/Make.defs | 10 | ||||
-rw-r--r-- | nuttx/sched/task/task_atexit.c (renamed from nuttx/sched/atexit.c) | 3 | ||||
-rw-r--r-- | nuttx/sched/task/task_getpid.c (renamed from nuttx/sched/getpid.c) | 3 | ||||
-rw-r--r-- | nuttx/sched/task/task_onexit.c (renamed from nuttx/sched/on_exit.c) | 3 | ||||
-rw-r--r-- | nuttx/sched/task/task_prctl.c (renamed from nuttx/sched/prctl.c) | 3 |
8 files changed, 20 insertions, 20 deletions
diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile index c1dade975..5a9a9f629 100644 --- a/nuttx/sched/Makefile +++ b/nuttx/sched/Makefile @@ -50,14 +50,6 @@ SCHED_SRCS += sched_setscheduler.c sched_getscheduler.c SCHED_SRCS += sched_yield.c sched_rrgetinterval.c sched_foreach.c SCHED_SRCS += sched_lock.c sched_unlock.c sched_lockcount.c sched_self.c -ifeq ($(CONFIG_SCHED_ATEXIT),y) -SCHED_SRCS += atexit.c -endif - -ifeq ($(CONFIG_SCHED_ONEXIT),y) -SCHED_SRCS += on_exit.c -endif - ifeq ($(CONFIG_PRIORITY_INHERITANCE),y) SCHED_SRCS += sched_reprioritize.c endif @@ -79,10 +71,6 @@ else SCHED_SRCS += sched_processtimer.c endif -ifneq ($(CONFIG_DISABLE_SIGNALS),y) -SCHED_SRCS += nanosleep.c -endif - include init/Make.defs include irq/Make.defs include paging/Make.defs @@ -99,7 +87,7 @@ include timer/Make.defs include environ/Make.defs # REVISIT -TSK_SRCS += prctl.c exit.c getpid.c +TSK_SRCS += exit.c CSRCS = $(INIT_SRCS) $(IRQ_SRCS) $(PG_SRCS) $(GRP_SRCS) $(SCHED_SRCS) CSRCS += $(TSK_SRCS) $(ERRNO_SRCS) $(WDOG_SRCS) $(SEM_SRCS) diff --git a/nuttx/sched/signal/Make.defs b/nuttx/sched/signal/Make.defs index d529d0e9b..77cb63608 100644 --- a/nuttx/sched/signal/Make.defs +++ b/nuttx/sched/signal/Make.defs @@ -42,7 +42,7 @@ SIGNAL_SRCS += sig_findaction.c sig_allocatependingsigaction.c SIGNAL_SRCS += sig_releasependingsigaction.c sig_unmaskpendingsignal.c SIGNAL_SRCS += sig_removependingsignal.c sig_releasependingsignal.c sig_lowest.c SIGNAL_SRCS += sig_mqnotempty.c sig_cleanup.c sig_dispatch.c sig_deliver.c -SIGNAL_SRCS += sig_pause.c +SIGNAL_SRCS += sig_pause.c sig_nanosleep.c # Include signal build support diff --git a/nuttx/sched/nanosleep.c b/nuttx/sched/signal/sig_nanosleep.c index 43414f2f2..5bdfa57c2 100644 --- a/nuttx/sched/nanosleep.c +++ b/nuttx/sched/signal/sig_nanosleep.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/nanosleep.c + * sched/signal/sig/nanosleep.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/sched/task/Make.defs b/nuttx/sched/task/Make.defs index 0d979e501..da2f43f07 100644 --- a/nuttx/sched/task/Make.defs +++ b/nuttx/sched/task/Make.defs @@ -36,7 +36,7 @@ TSK_SRCS = task_create.c task_init.c task_setup.c task_activate.c TSK_SRCS += task_start.c task_delete.c task_exit.c task_exithook.c TSK_SRCS += task_recover.c task_restart.c task_spawn.c task_spawnparms.c -TSK_SRCS += task_terminate.c task_getgroup.c +TSK_SRCS += task_terminate.c task_getgroup.c task_prctl.c task_getpid.c ifeq ($(CONFIG_ARCH_HAVE_VFORK),y) ifeq ($(CONFIG_SCHED_WAITPID),y) @@ -54,6 +54,14 @@ ifeq ($(CONFIG_SCHED_STARTHOOK),y) TSK_SRCS += task_starthook.c endif +ifeq ($(CONFIG_SCHED_ATEXIT),y) +TSK_SRCS += task_atexit.c +endif + +ifeq ($(CONFIG_SCHED_ONEXIT),y) +TSK_SRCS += task_onexit.c +endif + # Include task build support DEPPATH += --dep-path task diff --git a/nuttx/sched/atexit.c b/nuttx/sched/task/task_atexit.c index 7faa52d44..0365abd62 100644 --- a/nuttx/sched/atexit.c +++ b/nuttx/sched/task/task_atexit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/atexit.c + * sched/task/task_atexit.c * * Copyright (C) 2007, 2009, 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -48,6 +48,7 @@ #include <nuttx/fs/fs.h> #include "os_internal.h" +#include "task/task.h" #ifdef CONFIG_SCHED_ATEXIT diff --git a/nuttx/sched/getpid.c b/nuttx/sched/task/task_getpid.c index 69e2a9c34..524dd1486 100644 --- a/nuttx/sched/getpid.c +++ b/nuttx/sched/task/task_getpid.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/getpid.c + * sched/task/task_getpid.c * * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -42,6 +42,7 @@ #include <sched.h> #include "os_internal.h" +#include "task/task.h" /************************************************************************ * Pre-processor Definitions diff --git a/nuttx/sched/on_exit.c b/nuttx/sched/task/task_onexit.c index d5f180412..aa131c5af 100644 --- a/nuttx/sched/on_exit.c +++ b/nuttx/sched/task/task_onexit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/on_exit.c + * sched/task/task_onexit.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -48,6 +48,7 @@ #include <nuttx/fs/fs.h> #include "os_internal.h" +#include "task/task.h" #ifdef CONFIG_SCHED_ONEXIT diff --git a/nuttx/sched/prctl.c b/nuttx/sched/task/task_prctl.c index cf40708fa..f0f1f2ebb 100644 --- a/nuttx/sched/prctl.c +++ b/nuttx/sched/task/task_prctl.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/prctl.c + * sched/task/task_prctl.c * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -48,6 +48,7 @@ #include <nuttx/sched.h> #include "os_internal.h" +#include "task/task.h" /************************************************************************ * Private Functions |