From ccf4ed21482d61ae33571dd90521eacd9139e853 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 8 Aug 2014 17:29:44 -0600 Subject: [PATCH] Partial (non-working) checked in before the big, risky automated change --- sched/Makefile | 36 ++-------------------- sched/{os_internal.h => sched/sched.h} | 8 ++--- sched/{ => sched}/sched_addblocked.c | 4 +-- sched/{ => sched}/sched_addprioritized.c | 4 +-- sched/{ => sched}/sched_addreadytorun.c | 4 +-- sched/{ => sched}/sched_cpuload.c | 4 +-- sched/{ => sched}/sched_foreach.c | 4 +-- sched/{ => sched}/sched_free.c | 4 +-- sched/{ => sched}/sched_garbage.c | 4 +-- sched/{ => sched}/sched_getfiles.c | 4 +-- sched/{ => sched}/sched_getparam.c | 4 +-- sched/{ => sched}/sched_getscheduler.c | 4 +-- sched/{ => sched}/sched_getsockets.c | 4 +-- sched/{ => sched}/sched_getstreams.c | 4 +-- sched/{ => sched}/sched_gettcb.c | 4 +-- sched/{ => sched}/sched_lock.c | 4 +-- sched/{ => sched}/sched_lockcount.c | 4 +-- sched/{ => sched}/sched_mergepending.c | 4 +-- sched/{ => sched}/sched_processtimer.c | 4 +-- sched/{ => sched}/sched_releasetcb.c | 4 +-- sched/{ => sched}/sched_removeblocked.c | 4 +-- sched/{ => sched}/sched_removereadytorun.c | 2 +- sched/{ => sched}/sched_reprioritize.c | 4 +-- sched/{ => sched}/sched_rrgetinterval.c | 4 +-- sched/{ => sched}/sched_self.c | 4 +-- sched/{ => sched}/sched_setparam.c | 4 +-- sched/{ => sched}/sched_setpriority.c | 4 +-- sched/{ => sched}/sched_setscheduler.c | 4 +-- sched/{ => sched}/sched_timerexpiration.c | 4 +-- sched/{ => sched}/sched_unlock.c | 4 +-- sched/{ => sched}/sched_verifytcb.c | 2 +- sched/{ => sched}/sched_wait.c | 4 +-- sched/{ => sched}/sched_waitid.c | 4 +-- sched/{ => sched}/sched_waitpid.c | 4 +-- sched/{ => sched}/sched_yield.c | 4 +-- 35 files changed, 71 insertions(+), 101 deletions(-) rename sched/{os_internal.h => sched/sched.h} (98%) rename sched/{ => sched}/sched_addblocked.c (98%) rename sched/{ => sched}/sched_addprioritized.c (98%) rename sched/{ => sched}/sched_addreadytorun.c (98%) rename sched/{ => sched}/sched_cpuload.c (99%) rename sched/{ => sched}/sched_foreach.c (98%) rename sched/{ => sched}/sched_free.c (99%) rename sched/{ => sched}/sched_garbage.c (99%) rename sched/{ => sched}/sched_getfiles.c (98%) rename sched/{ => sched}/sched_getparam.c (98%) rename sched/{ => sched}/sched_getscheduler.c (98%) rename sched/{ => sched}/sched_getsockets.c (98%) rename sched/{ => sched}/sched_getstreams.c (98%) rename sched/{ => sched}/sched_gettcb.c (98%) rename sched/{ => sched}/sched_lock.c (98%) rename sched/{ => sched}/sched_lockcount.c (98%) rename sched/{ => sched}/sched_mergepending.c (98%) rename sched/{ => sched}/sched_processtimer.c (99%) rename sched/{ => sched}/sched_releasetcb.c (99%) rename sched/{ => sched}/sched_removeblocked.c (98%) rename sched/{ => sched}/sched_removereadytorun.c (99%) rename sched/{ => sched}/sched_reprioritize.c (98%) rename sched/{ => sched}/sched_rrgetinterval.c (98%) rename sched/{ => sched}/sched_self.c (98%) rename sched/{ => sched}/sched_setparam.c (98%) rename sched/{ => sched}/sched_setpriority.c (99%) rename sched/{ => sched}/sched_setscheduler.c (98%) rename sched/{ => sched}/sched_timerexpiration.c (99%) rename sched/{ => sched}/sched_unlock.c (99%) rename sched/{ => sched}/sched_verifytcb.c (99%) rename sched/{ => sched}/sched_wait.c (98%) rename sched/{ => sched}/sched_waitid.c (99%) rename sched/{ => sched}/sched_waitpid.c (99%) rename sched/{ => sched}/sched_yield.c (98%) diff --git a/sched/Makefile b/sched/Makefile index 5a9a9f6294..ff497fe661 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -38,43 +38,11 @@ VPATH = DEPPATH = --dep-path . -ASRCS = - -SCHED_SRCS = sched_garbage.c sched_getfiles.c -SCHED_SRCS += sched_addreadytorun.c sched_removereadytorun.c sched_addprioritized.c -SCHED_SRCS += sched_mergepending.c sched_addblocked.c sched_removeblocked.c -SCHED_SRCS += sched_free.c sched_gettcb.c sched_verifytcb.c sched_releasetcb.c -SCHED_SRCS += sched_getsockets.c sched_getstreams.c -SCHED_SRCS += sched_setparam.c sched_setpriority.c sched_getparam.c -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_PRIORITY_INHERITANCE),y) -SCHED_SRCS += sched_reprioritize.c -endif - -ifeq ($(CONFIG_SCHED_WAITPID),y) -SCHED_SRCS += sched_waitpid.c -ifeq ($(CONFIG_SCHED_HAVE_PARENT),y) -SCHED_SRCS += sched_waitid.c sched_wait.c -endif -endif - -ifeq ($(CONFIG_SCHED_CPULOAD),y) -SCHED_SRCS += sched_cpuload.c -endif - -ifeq ($(CONFIG_SCHED_TICKLESS),y) -SCHED_SRCS += sched_timerexpiration.c -else -SCHED_SRCS += sched_processtimer.c -endif - include init/Make.defs include irq/Make.defs include paging/Make.defs include group/Make.defs +include sched/Make.defs include task/Make.defs include errno/Make.defs include wdog/Make.defs @@ -89,6 +57,8 @@ include environ/Make.defs # REVISIT TSK_SRCS += exit.c +ASRCS = + CSRCS = $(INIT_SRCS) $(IRQ_SRCS) $(PG_SRCS) $(GRP_SRCS) $(SCHED_SRCS) CSRCS += $(TSK_SRCS) $(ERRNO_SRCS) $(WDOG_SRCS) $(SEM_SRCS) CSRCS += $(SIGNAL_SRCS) $(PTHREAD_SRCS) $(MQUEUE_SRCS) $(CLOCK_SRCS) diff --git a/sched/os_internal.h b/sched/sched/sched.h similarity index 98% rename from sched/os_internal.h rename to sched/sched/sched.h index 9307fb3136..47d6838f8a 100644 --- a/sched/os_internal.h +++ b/sched/sched/sched.h @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/os_internal.h + * sched/sched/sched.h * * Copyright (C) 2007-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SCHED_OS_INTERNAL_H -#define __SCHED_OS_INTERNAL_H +#ifndef __SCHED_SCHED_SCHED_H +#define __SCHED_SCHED_SCHED_H /**************************************************************************** * Included Files @@ -247,4 +247,4 @@ void weak_function sched_process_cpuload(void); bool sched_verifytcb(FAR struct tcb_s *tcb); int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype); -#endif /* __SCHED_OS_INTERNAL_H */ +#endif /* __SCHED_SCHED_SCHED_H */ diff --git a/sched/sched_addblocked.c b/sched/sched/sched_addblocked.c similarity index 98% rename from sched/sched_addblocked.c rename to sched/sched/sched_addblocked.c index 70191797e7..1a3fc90987 100644 --- a/sched/sched_addblocked.c +++ b/sched/sched/sched_addblocked.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_addblocked.c + * sched/sched/sched_addblocked.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Definitions diff --git a/sched/sched_addprioritized.c b/sched/sched/sched_addprioritized.c similarity index 98% rename from sched/sched_addprioritized.c rename to sched/sched/sched_addprioritized.c index 9940e18743..d132f335e3 100644 --- a/sched/sched_addprioritized.c +++ b/sched/sched/sched_addprioritized.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_addprioritized.c + * sched/sched/sched_addprioritized.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Pre-processor Definitions diff --git a/sched/sched_addreadytorun.c b/sched/sched/sched_addreadytorun.c similarity index 98% rename from sched/sched_addreadytorun.c rename to sched/sched/sched_addreadytorun.c index 156598cd27..5cd5359409 100644 --- a/sched/sched_addreadytorun.c +++ b/sched/sched/sched_addreadytorun.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_addreadytorun.c + * sched/sched/sched_addreadytorun.c * * Copyright (C) 2007-2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/sched/sched_cpuload.c b/sched/sched/sched_cpuload.c similarity index 99% rename from sched/sched_cpuload.c rename to sched/sched/sched_cpuload.c index 5a6bf6cc6b..fe9305b3d2 100644 --- a/sched/sched_cpuload.c +++ b/sched/sched/sched_cpuload.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_cpuload.c + * sched/sched/sched_cpuload.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #ifdef CONFIG_SCHED_CPULOAD diff --git a/sched/sched_foreach.c b/sched/sched/sched_foreach.c similarity index 98% rename from sched/sched_foreach.c rename to sched/sched/sched_foreach.c index e2e0798895..67badcedda 100644 --- a/sched/sched_foreach.c +++ b/sched/sched/sched_foreach.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_foreach.c + * sched/sched/sched_foreach.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,7 +38,7 @@ ************************************************************************/ #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Global Functions diff --git a/sched/sched_free.c b/sched/sched/sched_free.c similarity index 99% rename from sched/sched_free.c rename to sched/sched/sched_free.c index 7442a4d097..93d7dea1b7 100644 --- a/sched/sched_free.c +++ b/sched/sched/sched_free.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_free.c + * sched/sched/sched_free.c * * Copyright (C) 2007, 2009, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Definitions diff --git a/sched/sched_garbage.c b/sched/sched/sched_garbage.c similarity index 99% rename from sched/sched_garbage.c rename to sched/sched/sched_garbage.c index 8609bb27df..7a6839cb14 100644 --- a/sched/sched_garbage.c +++ b/sched/sched/sched_garbage.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_garbage.c + * sched/sched/sched_garbage.c * * Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -40,7 +40,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/sched/sched_getfiles.c b/sched/sched/sched_getfiles.c similarity index 98% rename from sched/sched_getfiles.c rename to sched/sched/sched_getfiles.c index abb051ef3c..b31999371f 100644 --- a/sched/sched_getfiles.c +++ b/sched/sched/sched_getfiles.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_getfiles.c + * sched/sched/sched_getfiles.c * * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,7 +39,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Private Functions diff --git a/sched/sched_getparam.c b/sched/sched/sched_getparam.c similarity index 98% rename from sched/sched_getparam.c rename to sched/sched/sched_getparam.c index 9fb829474d..f4d5dbb9b2 100644 --- a/sched/sched_getparam.c +++ b/sched/sched/sched_getparam.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_getparam.c + * sched/sched/sched_getparam.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Definitions diff --git a/sched/sched_getscheduler.c b/sched/sched/sched_getscheduler.c similarity index 98% rename from sched/sched_getscheduler.c rename to sched/sched/sched_getscheduler.c index 4d0ed950a2..6fde0d499a 100644 --- a/sched/sched_getscheduler.c +++ b/sched/sched/sched_getscheduler.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_getscheduler.c + * sched/sched/sched_getscheduler.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Definitions diff --git a/sched/sched_getsockets.c b/sched/sched/sched_getsockets.c similarity index 98% rename from sched/sched_getsockets.c rename to sched/sched/sched_getsockets.c index 17d1382ce7..764e2ffd21 100644 --- a/sched/sched_getsockets.c +++ b/sched/sched/sched_getsockets.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_getsockets.c + * sched/sched/sched_getsockets.c * * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -40,7 +40,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #if CONFIG_NSOCKET_DESCRIPTORS > 0 diff --git a/sched/sched_getstreams.c b/sched/sched/sched_getstreams.c similarity index 98% rename from sched/sched_getstreams.c rename to sched/sched/sched_getstreams.c index 3d9e0e3d15..f11015b57f 100644 --- a/sched/sched_getstreams.c +++ b/sched/sched/sched_getstreams.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_getstreams.c + * sched/sched/sched_getstreams.c * * Copyright (C) 2007, 2008, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,7 +39,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Private Functions diff --git a/sched/sched_gettcb.c b/sched/sched/sched_gettcb.c similarity index 98% rename from sched/sched_gettcb.c rename to sched/sched/sched_gettcb.c index 101f6d4131..d46a156044 100644 --- a/sched/sched_gettcb.c +++ b/sched/sched/sched_gettcb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_gettcb.c + * sched/sched/sched_gettcb.c * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Definitions diff --git a/sched/sched_lock.c b/sched/sched/sched_lock.c similarity index 98% rename from sched/sched_lock.c rename to sched/sched/sched_lock.c index 90a39d27d7..1837a1e5ed 100644 --- a/sched/sched_lock.c +++ b/sched/sched/sched_lock.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_lock.c + * sched/sched/sched_lock.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Definitions diff --git a/sched/sched_lockcount.c b/sched/sched/sched_lockcount.c similarity index 98% rename from sched/sched_lockcount.c rename to sched/sched/sched_lockcount.c index d1eccab40f..bfb70e9d19 100644 --- a/sched/sched_lockcount.c +++ b/sched/sched/sched_lockcount.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_lockcount.c + * sched/sched/sched_lockcount.c * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Definitions diff --git a/sched/sched_mergepending.c b/sched/sched/sched_mergepending.c similarity index 98% rename from sched/sched_mergepending.c rename to sched/sched/sched_mergepending.c index 885fec8324..6ba03662a0 100644 --- a/sched/sched_mergepending.c +++ b/sched/sched/sched_mergepending.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_mergepending.c + * sched/sched/sched_mergepending.c * * Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Pre-processor Definitions diff --git a/sched/sched_processtimer.c b/sched/sched/sched_processtimer.c similarity index 99% rename from sched/sched_processtimer.c rename to sched/sched/sched_processtimer.c index 86bee80b80..3c31a25598 100644 --- a/sched/sched_processtimer.c +++ b/sched/sched/sched_processtimer.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_processtimer.c + * sched/sched/sched_processtimer.c * * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ # include #endif -#include "os_internal.h" +#include "sched/sched.h" #include "wdog/wdog.h" #include "clock/clock.h" diff --git a/sched/sched_releasetcb.c b/sched/sched/sched_releasetcb.c similarity index 99% rename from sched/sched_releasetcb.c rename to sched/sched/sched_releasetcb.c index 69d7d99d30..7c7eeae3a4 100644 --- a/sched/sched_releasetcb.c +++ b/sched/sched/sched_releasetcb.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_releasetcb.c + * sched/sched/sched_releasetcb.c * * Copyright (C) 2007, 2009, 2012-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "timer/timer.h" diff --git a/sched/sched_removeblocked.c b/sched/sched/sched_removeblocked.c similarity index 98% rename from sched/sched_removeblocked.c rename to sched/sched/sched_removeblocked.c index c21f555ec9..216b262738 100644 --- a/sched/sched_removeblocked.c +++ b/sched/sched/sched_removeblocked.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_removeblocked.c + * sched/sched/sched_removeblocked.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Definitions diff --git a/sched/sched_removereadytorun.c b/sched/sched/sched_removereadytorun.c similarity index 99% rename from sched/sched_removereadytorun.c rename to sched/sched/sched_removereadytorun.c index b1f215a929..d89ecb9e33 100644 --- a/sched/sched_removereadytorun.c +++ b/sched/sched/sched_removereadytorun.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/sched/sched_reprioritize.c b/sched/sched/sched_reprioritize.c similarity index 98% rename from sched/sched_reprioritize.c rename to sched/sched/sched_reprioritize.c index 66a29c42ba..917ec87159 100644 --- a/sched/sched_reprioritize.c +++ b/sched/sched/sched_reprioritize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_reprioritize.c + * sched/sched/sched_reprioritize.c * * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #ifdef CONFIG_PRIORITY_INHERITANCE diff --git a/sched/sched_rrgetinterval.c b/sched/sched/sched_rrgetinterval.c similarity index 98% rename from sched/sched_rrgetinterval.c rename to sched/sched/sched_rrgetinterval.c index 9790f461d1..61d8c6bc5e 100644 --- a/sched/sched_rrgetinterval.c +++ b/sched/sched/sched_rrgetinterval.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_rrgetinterval.c + * sched/sched/sched_rrgetinterval.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" /************************************************************************ diff --git a/sched/sched_self.c b/sched/sched/sched_self.c similarity index 98% rename from sched/sched_self.c rename to sched/sched/sched_self.c index 901fb6e693..75c4177069 100644 --- a/sched/sched_self.c +++ b/sched/sched/sched_self.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_self.c + * sched/sched/sched_self.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,7 +39,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Definitions diff --git a/sched/sched_setparam.c b/sched/sched/sched_setparam.c similarity index 98% rename from sched/sched_setparam.c rename to sched/sched/sched_setparam.c index 828f38101e..2d954a23b7 100644 --- a/sched/sched_setparam.c +++ b/sched/sched/sched_setparam.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_setparam.c + * sched/sched/sched_setparam.c * * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Definitions diff --git a/sched/sched_setpriority.c b/sched/sched/sched_setpriority.c similarity index 99% rename from sched/sched_setpriority.c rename to sched/sched/sched_setpriority.c index 13f177271b..ab2b0ec8e2 100644 --- a/sched/sched_setpriority.c +++ b/sched/sched/sched_setpriority.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_setpriority.c + * sched/sched/sched_setpriority.c * * Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Definitions diff --git a/sched/sched_setscheduler.c b/sched/sched/sched_setscheduler.c similarity index 98% rename from sched/sched_setscheduler.c rename to sched/sched/sched_setscheduler.c index 3aaae4013a..62aa9cac22 100644 --- a/sched/sched_setscheduler.c +++ b/sched/sched/sched_setscheduler.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_setscheduler.c + * sched/sched/sched_setscheduler.c * * Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" /**************************************************************************** diff --git a/sched/sched_timerexpiration.c b/sched/sched/sched_timerexpiration.c similarity index 99% rename from sched/sched_timerexpiration.c rename to sched/sched/sched_timerexpiration.c index 60acda509f..c721005d9b 100644 --- a/sched/sched_timerexpiration.c +++ b/sched/sched/sched_timerexpiration.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_timerexpiration.c + * sched/sched/sched_timerexpiration.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,7 @@ # include #endif -#include "os_internal.h" +#include "sched/sched.h" #include "wdog/wdog.h" #include "clock/clock.h" diff --git a/sched/sched_unlock.c b/sched/sched/sched_unlock.c similarity index 99% rename from sched/sched_unlock.c rename to sched/sched/sched_unlock.c index df3b966e74..2673d32af6 100644 --- a/sched/sched_unlock.c +++ b/sched/sched/sched_unlock.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sched_unlock.c + * sched/sched/sched_unlock.c * * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /************************************************************************ * Pre-processor Definitions diff --git a/sched/sched_verifytcb.c b/sched/sched/sched_verifytcb.c similarity index 99% rename from sched/sched_verifytcb.c rename to sched/sched/sched_verifytcb.c index 638acb361c..d9fb34f2d5 100644 --- a/sched/sched_verifytcb.c +++ b/sched/sched/sched_verifytcb.c @@ -42,7 +42,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Definitions diff --git a/sched/sched_wait.c b/sched/sched/sched_wait.c similarity index 98% rename from sched/sched_wait.c rename to sched/sched/sched_wait.c index 9a6265e700..d2efd8ee2a 100644 --- a/sched/sched_wait.c +++ b/sched/sched/sched_wait.c @@ -1,5 +1,5 @@ /***************************************************************************** - * sched/sched_wait.c + * sched/sched/sched_wait.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #if defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT) diff --git a/sched/sched_waitid.c b/sched/sched/sched_waitid.c similarity index 99% rename from sched/sched_waitid.c rename to sched/sched/sched_waitid.c index 7329ef946d..b1b0587f6e 100644 --- a/sched/sched_waitid.c +++ b/sched/sched/sched_waitid.c @@ -1,5 +1,5 @@ /***************************************************************************** - * sched/sched_waitid.c + * sched/sched/sched_waitid.c * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #if defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT) diff --git a/sched/sched_waitpid.c b/sched/sched/sched_waitpid.c similarity index 99% rename from sched/sched_waitpid.c rename to sched/sched/sched_waitpid.c index 48f932878b..61c846e826 100644 --- a/sched/sched_waitpid.c +++ b/sched/sched/sched_waitpid.c @@ -1,5 +1,5 @@ /***************************************************************************** - * sched/sched_waitpid.c + * sched/sched/sched_waitpid.c * * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #ifdef CONFIG_SCHED_WAITPID diff --git a/sched/sched_yield.c b/sched/sched/sched_yield.c similarity index 98% rename from sched/sched_yield.c rename to sched/sched/sched_yield.c index 4972668c79..a4a3c744e5 100644 --- a/sched/sched_yield.c +++ b/sched/sched/sched_yield.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sched_yield.c + * sched/sched/sched_yield.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Definitions