From d798dd37a75c3dd89b66aef2be27e130d574bbf5 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 8 Aug 2014 17:53:55 -0600 Subject: [PATCH] Replace os_internal.h with sched/sched.h in files that actually reference something in sched.h --- arch/8051/src/up_assert.c | 2 +- arch/8051/src/up_blocktask.c | 2 +- arch/8051/src/up_exit.c | 2 +- arch/8051/src/up_releasepending.c | 2 +- arch/8051/src/up_reprioritizertr.c | 2 +- arch/8051/src/up_unblocktask.c | 2 +- arch/arm/src/arm/up_assert.c | 2 +- arch/arm/src/arm/up_blocktask.c | 2 +- arch/arm/src/arm/up_dataabort.c | 2 +- arch/arm/src/arm/up_prefetchabort.c | 2 +- arch/arm/src/arm/up_releasepending.c | 2 +- arch/arm/src/arm/up_reprioritizertr.c | 2 +- arch/arm/src/arm/up_schedulesigaction.c | 2 +- arch/arm/src/arm/up_sigdeliver.c | 2 +- arch/arm/src/arm/up_unblocktask.c | 2 +- arch/arm/src/armv6-m/up_assert.c | 2 +- arch/arm/src/armv6-m/up_blocktask.c | 2 +- arch/arm/src/armv6-m/up_releasepending.c | 2 +- arch/arm/src/armv6-m/up_reprioritizertr.c | 2 +- arch/arm/src/armv6-m/up_schedulesigaction.c | 2 +- arch/arm/src/armv6-m/up_sigdeliver.c | 2 +- arch/arm/src/armv6-m/up_unblocktask.c | 2 +- arch/arm/src/armv7-a/arm_assert.c | 2 +- arch/arm/src/armv7-a/arm_blocktask.c | 2 +- arch/arm/src/armv7-a/arm_dataabort.c | 2 +- arch/arm/src/armv7-a/arm_prefetchabort.c | 2 +- arch/arm/src/armv7-a/arm_releasepending.c | 2 +- arch/arm/src/armv7-a/arm_reprioritizertr.c | 2 +- arch/arm/src/armv7-a/arm_schedulesigaction.c | 2 +- arch/arm/src/armv7-a/arm_sigdeliver.c | 2 +- arch/arm/src/armv7-a/arm_unblocktask.c | 2 +- arch/arm/src/armv7-m/up_assert.c | 2 +- arch/arm/src/armv7-m/up_blocktask.c | 2 +- arch/arm/src/armv7-m/up_releasepending.c | 2 +- arch/arm/src/armv7-m/up_reprioritizertr.c | 2 +- arch/arm/src/armv7-m/up_schedulesigaction.c | 2 +- arch/arm/src/armv7-m/up_sigdeliver.c | 2 +- arch/arm/src/armv7-m/up_unblocktask.c | 2 +- arch/arm/src/common/up_checkstack.c | 2 +- arch/arm/src/common/up_exit.c | 2 +- arch/arm/src/common/up_vfork.c | 2 +- arch/arm/src/sam34/sam_dmac.c | 2 +- arch/arm/src/sama5/sam_dmac.c | 2 +- arch/arm/src/sama5/sam_xdmac.c | 2 +- arch/arm/src/stm32/stm32f10xxx_dma.c | 2 +- arch/arm/src/stm32/stm32f20xxx_dma.c | 2 +- arch/arm/src/stm32/stm32f40xxx_dma.c | 2 +- arch/avr/src/avr/up_blocktask.c | 2 +- arch/avr/src/avr/up_checkstack.c | 2 +- arch/avr/src/avr/up_dumpstate.c | 2 +- arch/avr/src/avr/up_releasepending.c | 2 +- arch/avr/src/avr/up_reprioritizertr.c | 2 +- arch/avr/src/avr/up_schedulesigaction.c | 2 +- arch/avr/src/avr/up_sigdeliver.c | 2 +- arch/avr/src/avr/up_unblocktask.c | 2 +- arch/avr/src/avr32/up_blocktask.c | 2 +- arch/avr/src/avr32/up_dumpstate.c | 2 +- arch/avr/src/avr32/up_releasepending.c | 2 +- arch/avr/src/avr32/up_reprioritizertr.c | 2 +- arch/avr/src/avr32/up_schedulesigaction.c | 2 +- arch/avr/src/avr32/up_sigdeliver.c | 2 +- arch/avr/src/avr32/up_unblocktask.c | 2 +- arch/avr/src/common/up_assert.c | 2 +- arch/avr/src/common/up_exit.c | 2 +- arch/hc/src/common/up_blocktask.c | 2 +- arch/hc/src/common/up_exit.c | 2 +- arch/hc/src/common/up_releasepending.c | 2 +- arch/hc/src/common/up_reprioritizertr.c | 2 +- arch/hc/src/common/up_unblocktask.c | 2 +- arch/hc/src/m9s12/m9s12_assert.c | 2 +- arch/mips/src/common/up_exit.c | 2 +- arch/mips/src/mips32/up_assert.c | 2 +- arch/mips/src/mips32/up_blocktask.c | 2 +- arch/mips/src/mips32/up_dumpstate.c | 2 +- arch/mips/src/mips32/up_releasepending.c | 2 +- arch/mips/src/mips32/up_reprioritizertr.c | 2 +- arch/mips/src/mips32/up_schedulesigaction.c | 2 +- arch/mips/src/mips32/up_sigdeliver.c | 2 +- arch/mips/src/mips32/up_unblocktask.c | 2 +- arch/mips/src/mips32/up_vfork.c | 2 +- arch/rgmp/src/nuttx.c | 2 +- arch/rgmp/src/rgmp.c | 2 +- arch/sh/src/common/up_assert.c | 2 +- arch/sh/src/common/up_blocktask.c | 2 +- arch/sh/src/common/up_exit.c | 2 +- arch/sh/src/common/up_releasepending.c | 2 +- arch/sh/src/common/up_reprioritizertr.c | 2 +- arch/sh/src/common/up_unblocktask.c | 2 +- arch/sh/src/m16c/m16c_dumpstate.c | 2 +- arch/sh/src/m16c/m16c_schedulesigaction.c | 2 +- arch/sh/src/m16c/m16c_sigdeliver.c | 2 +- arch/sh/src/sh1/sh1_dumpstate.c | 2 +- arch/sh/src/sh1/sh1_schedulesigaction.c | 2 +- arch/sh/src/sh1/sh1_sigdeliver.c | 2 +- arch/sim/src/up_blocktask.c | 2 +- arch/sim/src/up_exit.c | 2 +- arch/sim/src/up_releasepending.c | 2 +- arch/sim/src/up_reprioritizertr.c | 2 +- arch/sim/src/up_schedulesigaction.c | 2 +- arch/sim/src/up_unblocktask.c | 2 +- arch/x86/src/common/up_assert.c | 2 +- arch/x86/src/common/up_blocktask.c | 2 +- arch/x86/src/common/up_exit.c | 2 +- arch/x86/src/common/up_releasepending.c | 2 +- arch/x86/src/common/up_reprioritizertr.c | 2 +- arch/x86/src/common/up_unblocktask.c | 2 +- arch/x86/src/i486/up_schedulesigaction.c | 2 +- arch/x86/src/i486/up_sigdeliver.c | 2 +- arch/z16/src/common/up_assert.c | 2 +- arch/z16/src/common/up_blocktask.c | 2 +- arch/z16/src/common/up_exit.c | 2 +- arch/z16/src/common/up_releasepending.c | 2 +- arch/z16/src/common/up_reprioritizertr.c | 2 +- arch/z16/src/common/up_schedulesigaction.c | 2 +- arch/z16/src/common/up_sigdeliver.c | 2 +- arch/z16/src/common/up_stackdump.c | 2 +- arch/z16/src/common/up_unblocktask.c | 2 +- arch/z80/src/common/up_assert.c | 2 +- arch/z80/src/common/up_blocktask.c | 2 +- arch/z80/src/common/up_exit.c | 2 +- arch/z80/src/common/up_releasepending.c | 2 +- arch/z80/src/common/up_reprioritizertr.c | 2 +- arch/z80/src/common/up_stackdump.c | 2 +- arch/z80/src/common/up_unblocktask.c | 2 +- arch/z80/src/ez80/ez80_schedulesigaction.c | 2 +- arch/z80/src/ez80/ez80_sigdeliver.c | 2 +- arch/z80/src/z180/z180_schedulesigaction.c | 2 +- arch/z80/src/z180/z180_sigdeliver.c | 2 +- arch/z80/src/z8/z8_schedulesigaction.c | 2 +- arch/z80/src/z8/z8_sigdeliver.c | 2 +- arch/z80/src/z80/z80_schedulesigaction.c | 2 +- arch/z80/src/z80/z80_sigdeliver.c | 2 +- binfmt/binfmt_execmodule.c | 2 +- sched/environ/env_clearenv.c | 2 +- sched/environ/env_dup.c | 2 +- sched/environ/env_getenv.c | 2 +- sched/environ/env_getenvironptr.c | 2 +- sched/environ/env_setenv.c | 2 +- sched/environ/env_unsetenv.c | 2 +- sched/errno/errno_getptr.c | 2 +- sched/exit.c | 2 +- sched/group/group_childstatus.c | 2 +- sched/group/group_setuptaskfiles.c | 2 +- sched/group/group_signal.c | 2 +- sched/init/os_start.c | 2 +- sched/mqueue/mq_close.c | 2 +- sched/mqueue/mq_notify.c | 2 +- sched/mqueue/mq_open.c | 2 +- sched/mqueue/mq_rcvinternal.c | 2 +- sched/mqueue/mq_sndinternal.c | 2 +- sched/mqueue/mq_timedreceive.c | 2 +- sched/mqueue/mq_timedsend.c | 2 +- sched/paging/pg_miss.c | 2 +- sched/paging/pg_worker.c | 2 +- sched/pthread/pthread_cancel.c | 2 +- sched/pthread/pthread_completejoin.c | 2 +- sched/pthread/pthread_condtimedwait.c | 2 +- sched/pthread/pthread_create.c | 2 +- sched/pthread/pthread_detach.c | 2 +- sched/pthread/pthread_exit.c | 2 +- sched/pthread/pthread_getspecific.c | 2 +- sched/pthread/pthread_join.c | 2 +- sched/pthread/pthread_keycreate.c | 2 +- sched/pthread/pthread_setcancelstate.c | 2 +- sched/pthread/pthread_setschedprio.c | 2 +- sched/pthread/pthread_setspecific.c | 2 +- sched/semaphore/sem_holder.c | 2 +- sched/semaphore/sem_post.c | 2 +- sched/semaphore/sem_timedwait.c | 2 +- sched/semaphore/sem_trywait.c | 2 +- sched/semaphore/sem_wait.c | 2 +- sched/signal/sig_action.c | 2 +- sched/signal/sig_dispatch.c | 2 +- sched/signal/sig_kill.c | 2 +- sched/signal/sig_mqnotempty.c | 2 +- sched/signal/sig_pending.c | 2 +- sched/signal/sig_procmask.c | 2 +- sched/signal/sig_queue.c | 2 +- sched/signal/sig_suspend.c | 2 +- sched/signal/sig_timedwait.c | 2 +- sched/signal/sig_unmaskpendingsignal.c | 2 +- sched/task/task_atexit.c | 2 +- sched/task/task_create.c | 2 +- sched/task/task_delete.c | 2 +- sched/task/task_exit.c | 2 +- sched/task/task_exithook.c | 2 +- sched/task/task_getgroup.c | 2 +- sched/task/task_getpid.c | 2 +- sched/task/task_init.c | 2 +- sched/task/task_onexit.c | 2 +- sched/task/task_posixspawn.c | 2 +- sched/task/task_prctl.c | 2 +- sched/task/task_reparent.c | 2 +- sched/task/task_restart.c | 2 +- sched/task/task_setup.c | 2 +- sched/task/task_spawn.c | 2 +- sched/task/task_start.c | 2 +- sched/task/task_terminate.c | 2 +- sched/task/task_vfork.c | 2 +- sched/wdog/wd_cancel.c | 2 +- sched/wdog/wd_start.c | 2 +- 201 files changed, 201 insertions(+), 201 deletions(-) diff --git a/arch/8051/src/up_assert.c b/arch/8051/src/up_assert.c index 0be57a79261..ca0be70bb7f 100644 --- a/arch/8051/src/up_assert.c +++ b/arch/8051/src/up_assert.c @@ -48,7 +48,7 @@ #include <8052.h> -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_mem.h" diff --git a/arch/8051/src/up_blocktask.c b/arch/8051/src/up_blocktask.c index 1ae7a78a465..72a519b2bff 100644 --- a/arch/8051/src/up_blocktask.c +++ b/arch/8051/src/up_blocktask.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /************************************************************************ diff --git a/arch/8051/src/up_exit.c b/arch/8051/src/up_exit.c index 9ef27329445..29fe790fb0a 100644 --- a/arch/8051/src/up_exit.c +++ b/arch/8051/src/up_exit.c @@ -46,7 +46,7 @@ #include #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************************** diff --git a/arch/8051/src/up_releasepending.c b/arch/8051/src/up_releasepending.c index e26b4bcbb4a..ebb5271a60a 100644 --- a/arch/8051/src/up_releasepending.c +++ b/arch/8051/src/up_releasepending.c @@ -44,7 +44,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /************************************************************************ diff --git a/arch/8051/src/up_reprioritizertr.c b/arch/8051/src/up_reprioritizertr.c index 2807b11417c..7f28c711baf 100644 --- a/arch/8051/src/up_reprioritizertr.c +++ b/arch/8051/src/up_reprioritizertr.c @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/8051/src/up_unblocktask.c b/arch/8051/src/up_unblocktask.c index 451487f1bac..36d6ed1ef5e 100644 --- a/arch/8051/src/up_unblocktask.c +++ b/arch/8051/src/up_unblocktask.c @@ -45,7 +45,7 @@ #include #include "clock/clock.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /************************************************************************ diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c index f729d855075..c594a58de4e 100644 --- a/arch/arm/src/arm/up_assert.c +++ b/arch/arm/src/arm/up_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/arm/up_blocktask.c b/arch/arm/src/arm/up_blocktask.c index d0e35e558de..99ec9cbddbe 100644 --- a/arch/arm/src/arm/up_blocktask.c +++ b/arch/arm/src/arm/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c index 2b05abdeb41..dc2a08a479f 100644 --- a/arch/arm/src/arm/up_dataabort.c +++ b/arch/arm/src/arm/up_dataabort.c @@ -44,7 +44,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifdef CONFIG_PAGING diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c index ae8af72bcc5..577bc1b8ba8 100644 --- a/arch/arm/src/arm/up_prefetchabort.c +++ b/arch/arm/src/arm/up_prefetchabort.c @@ -47,7 +47,7 @@ # include #endif -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/arm/up_releasepending.c b/arch/arm/src/arm/up_releasepending.c index 21539770662..2c58b735d05 100644 --- a/arch/arm/src/arm/up_releasepending.c +++ b/arch/arm/src/arm/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/arm/up_reprioritizertr.c b/arch/arm/src/arm/up_reprioritizertr.c index cd5955c24ca..0a0c00aff09 100644 --- a/arch/arm/src/arm/up_reprioritizertr.c +++ b/arch/arm/src/arm/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/arm/up_schedulesigaction.c b/arch/arm/src/arm/up_schedulesigaction.c index f7d33254b0a..f14263c6a36 100644 --- a/arch/arm/src/arm/up_schedulesigaction.c +++ b/arch/arm/src/arm/up_schedulesigaction.c @@ -46,7 +46,7 @@ #include #include "arm.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/arm/up_sigdeliver.c b/arch/arm/src/arm/up_sigdeliver.c index 1d1a206657c..12a7c176028 100644 --- a/arch/arm/src/arm/up_sigdeliver.c +++ b/arch/arm/src/arm/up_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/arm/up_unblocktask.c b/arch/arm/src/arm/up_unblocktask.c index 696007b80ed..eae0733daf6 100644 --- a/arch/arm/src/arm/up_unblocktask.c +++ b/arch/arm/src/arm/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c index 1becf498716..5bd9790d03f 100644 --- a/arch/arm/src/armv6-m/up_assert.c +++ b/arch/arm/src/armv6-m/up_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv6-m/up_blocktask.c b/arch/arm/src/armv6-m/up_blocktask.c index c51308cfc63..a3395e66401 100644 --- a/arch/arm/src/armv6-m/up_blocktask.c +++ b/arch/arm/src/armv6-m/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv6-m/up_releasepending.c b/arch/arm/src/armv6-m/up_releasepending.c index 5300f7598f9..6c981252500 100644 --- a/arch/arm/src/armv6-m/up_releasepending.c +++ b/arch/arm/src/armv6-m/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv6-m/up_reprioritizertr.c b/arch/arm/src/armv6-m/up_reprioritizertr.c index a90aa983551..48629f57c09 100644 --- a/arch/arm/src/armv6-m/up_reprioritizertr.c +++ b/arch/arm/src/armv6-m/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv6-m/up_schedulesigaction.c b/arch/arm/src/armv6-m/up_schedulesigaction.c index 308f395b8bf..e6e4314fd68 100644 --- a/arch/arm/src/armv6-m/up_schedulesigaction.c +++ b/arch/arm/src/armv6-m/up_schedulesigaction.c @@ -47,7 +47,7 @@ #include "psr.h" #include "exc_return.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/armv6-m/up_sigdeliver.c b/arch/arm/src/armv6-m/up_sigdeliver.c index b38ed228a30..e1e8589eaa9 100644 --- a/arch/arm/src/armv6-m/up_sigdeliver.c +++ b/arch/arm/src/armv6-m/up_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/armv6-m/up_unblocktask.c b/arch/arm/src/armv6-m/up_unblocktask.c index fa6b8c6525c..b42c3841d87 100644 --- a/arch/arm/src/armv6-m/up_unblocktask.c +++ b/arch/arm/src/armv6-m/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c index 12a5615a0e0..f490a518ba8 100644 --- a/arch/arm/src/armv7-a/arm_assert.c +++ b/arch/arm/src/armv7-a/arm_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-a/arm_blocktask.c b/arch/arm/src/armv7-a/arm_blocktask.c index 2cc52240e72..df4f96b229d 100644 --- a/arch/arm/src/armv7-a/arm_blocktask.c +++ b/arch/arm/src/armv7-a/arm_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c index 7a4d2bea143..073afe210fd 100644 --- a/arch/arm/src/armv7-a/arm_dataabort.c +++ b/arch/arm/src/armv7-a/arm_dataabort.c @@ -44,7 +44,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifdef CONFIG_PAGING diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c index 4a8e820ab4e..089e6105c2f 100644 --- a/arch/arm/src/armv7-a/arm_prefetchabort.c +++ b/arch/arm/src/armv7-a/arm_prefetchabort.c @@ -47,7 +47,7 @@ # include #endif -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-a/arm_releasepending.c b/arch/arm/src/armv7-a/arm_releasepending.c index 004ef51aa9c..45595b09135 100644 --- a/arch/arm/src/armv7-a/arm_releasepending.c +++ b/arch/arm/src/armv7-a/arm_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-a/arm_reprioritizertr.c b/arch/arm/src/armv7-a/arm_reprioritizertr.c index e14b5744b08..e90e834334a 100644 --- a/arch/arm/src/armv7-a/arm_reprioritizertr.c +++ b/arch/arm/src/armv7-a/arm_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c b/arch/arm/src/armv7-a/arm_schedulesigaction.c index 819fe16fda3..1a6d88b0562 100644 --- a/arch/arm/src/armv7-a/arm_schedulesigaction.c +++ b/arch/arm/src/armv7-a/arm_schedulesigaction.c @@ -46,7 +46,7 @@ #include #include "arm.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c index 2cfd72fad44..cf800efc167 100644 --- a/arch/arm/src/armv7-a/arm_sigdeliver.c +++ b/arch/arm/src/armv7-a/arm_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/armv7-a/arm_unblocktask.c b/arch/arm/src/armv7-a/arm_unblocktask.c index 71106fd2522..750c900f94c 100644 --- a/arch/arm/src/armv7-a/arm_unblocktask.c +++ b/arch/arm/src/armv7-a/arm_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c index 2c538f0177e..a01cc0b4879 100644 --- a/arch/arm/src/armv7-m/up_assert.c +++ b/arch/arm/src/armv7-m/up_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-m/up_blocktask.c b/arch/arm/src/armv7-m/up_blocktask.c index d7965d4c428..3b316eca536 100644 --- a/arch/arm/src/armv7-m/up_blocktask.c +++ b/arch/arm/src/armv7-m/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-m/up_releasepending.c b/arch/arm/src/armv7-m/up_releasepending.c index 0b3fc6247ed..f29bca9110f 100644 --- a/arch/arm/src/armv7-m/up_releasepending.c +++ b/arch/arm/src/armv7-m/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-m/up_reprioritizertr.c b/arch/arm/src/armv7-m/up_reprioritizertr.c index c2cb07530e7..8e48ab8df90 100644 --- a/arch/arm/src/armv7-m/up_reprioritizertr.c +++ b/arch/arm/src/armv7-m/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/armv7-m/up_schedulesigaction.c b/arch/arm/src/armv7-m/up_schedulesigaction.c index f1885d63103..8110ef2dac1 100644 --- a/arch/arm/src/armv7-m/up_schedulesigaction.c +++ b/arch/arm/src/armv7-m/up_schedulesigaction.c @@ -47,7 +47,7 @@ #include "psr.h" #include "exc_return.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/armv7-m/up_sigdeliver.c b/arch/arm/src/armv7-m/up_sigdeliver.c index 135c4411107..4fbfc02c5d3 100644 --- a/arch/arm/src/armv7-m/up_sigdeliver.c +++ b/arch/arm/src/armv7-m/up_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/arm/src/armv7-m/up_unblocktask.c b/arch/arm/src/armv7-m/up_unblocktask.c index bd83ace9ffa..bc5548e1b7c 100644 --- a/arch/arm/src/armv7-m/up_unblocktask.c +++ b/arch/arm/src/armv7-m/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/arm/src/common/up_checkstack.c b/arch/arm/src/common/up_checkstack.c index 02f95f7ba82..314a8c881c9 100644 --- a/arch/arm/src/common/up_checkstack.c +++ b/arch/arm/src/common/up_checkstack.c @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c index 70358184d9a..1b67a079023 100644 --- a/arch/arm/src/common/up_exit.c +++ b/arch/arm/src/common/up_exit.c @@ -48,7 +48,7 @@ #endif #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/common/up_vfork.c b/arch/arm/src/common/up_vfork.c index 56b061b53e3..5d328a86389 100644 --- a/arch/arm/src/common/up_vfork.c +++ b/arch/arm/src/common/up_vfork.c @@ -50,7 +50,7 @@ #include #include "up_vfork.h" -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c index eee5722a402..528e74773ff 100644 --- a/arch/arm/src/sam34/sam_dmac.c +++ b/arch/arm/src/sam34/sam_dmac.c @@ -52,7 +52,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #include "chip.h" #include "sam_dmac.h" diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c index 9cf4a6c02fc..f248d58937c 100644 --- a/arch/arm/src/sama5/sam_dmac.c +++ b/arch/arm/src/sama5/sam_dmac.c @@ -53,7 +53,7 @@ #include "up_arch.h" #include "cache.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #include "chip.h" #include "sam_dmac.h" diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c index 6e4ca9ed4dc..d91f6f72159 100644 --- a/arch/arm/src/sama5/sam_xdmac.c +++ b/arch/arm/src/sama5/sam_xdmac.c @@ -53,7 +53,7 @@ #include "up_arch.h" #include "cache.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #include "chip.h" #include "sam_dmac.h" diff --git a/arch/arm/src/stm32/stm32f10xxx_dma.c b/arch/arm/src/stm32/stm32f10xxx_dma.c index da21fceb58c..67bfd12991f 100644 --- a/arch/arm/src/stm32/stm32f10xxx_dma.c +++ b/arch/arm/src/stm32/stm32f10xxx_dma.c @@ -51,7 +51,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #include "chip.h" #include "stm32_dma.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32f20xxx_dma.c b/arch/arm/src/stm32/stm32f20xxx_dma.c index ea1a1f0ed9e..f6fc4818d2c 100644 --- a/arch/arm/src/stm32/stm32f20xxx_dma.c +++ b/arch/arm/src/stm32/stm32f20xxx_dma.c @@ -51,7 +51,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #include "chip.h" #include "stm32_dma.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32f40xxx_dma.c b/arch/arm/src/stm32/stm32f40xxx_dma.c index 12c59de4652..9450dd0a78c 100644 --- a/arch/arm/src/stm32/stm32f40xxx_dma.c +++ b/arch/arm/src/stm32/stm32f40xxx_dma.c @@ -51,7 +51,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #include "chip.h" #include "stm32_dma.h" #include "stm32.h" diff --git a/arch/avr/src/avr/up_blocktask.c b/arch/avr/src/avr/up_blocktask.c index 004bf6e4454..243e883f1e7 100644 --- a/arch/avr/src/avr/up_blocktask.c +++ b/arch/avr/src/avr/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/avr/src/avr/up_checkstack.c b/arch/avr/src/avr/up_checkstack.c index 647b1c99bf9..dd24e0c756f 100644 --- a/arch/avr/src/avr/up_checkstack.c +++ b/arch/avr/src/avr/up_checkstack.c @@ -47,7 +47,7 @@ #include #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/avr/src/avr/up_dumpstate.c b/arch/avr/src/avr/up_dumpstate.c index ba81eda2e21..8802dd80c57 100644 --- a/arch/avr/src/avr/up_dumpstate.c +++ b/arch/avr/src/avr/up_dumpstate.c @@ -49,7 +49,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/avr/src/avr/up_releasepending.c b/arch/avr/src/avr/up_releasepending.c index a3646f6f9f3..c2f651de833 100644 --- a/arch/avr/src/avr/up_releasepending.c +++ b/arch/avr/src/avr/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/avr/src/avr/up_reprioritizertr.c b/arch/avr/src/avr/up_reprioritizertr.c index 773b0ede8eb..74b7ab48eae 100644 --- a/arch/avr/src/avr/up_reprioritizertr.c +++ b/arch/avr/src/avr/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/avr/src/avr/up_schedulesigaction.c b/arch/avr/src/avr/up_schedulesigaction.c index 304f2dc2286..ebd40eba56b 100644 --- a/arch/avr/src/avr/up_schedulesigaction.c +++ b/arch/avr/src/avr/up_schedulesigaction.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/avr/src/avr/up_sigdeliver.c b/arch/avr/src/avr/up_sigdeliver.c index 7a26f9fc6de..ec6c35331d3 100644 --- a/arch/avr/src/avr/up_sigdeliver.c +++ b/arch/avr/src/avr/up_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/avr/src/avr/up_unblocktask.c b/arch/avr/src/avr/up_unblocktask.c index 3947c3e8b7c..1558af1464c 100644 --- a/arch/avr/src/avr/up_unblocktask.c +++ b/arch/avr/src/avr/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/avr/src/avr32/up_blocktask.c b/arch/avr/src/avr32/up_blocktask.c index 955d3b1d2d4..2889adddef0 100644 --- a/arch/avr/src/avr32/up_blocktask.c +++ b/arch/avr/src/avr32/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/avr/src/avr32/up_dumpstate.c b/arch/avr/src/avr32/up_dumpstate.c index bc74d9bb042..345eb348635 100644 --- a/arch/avr/src/avr32/up_dumpstate.c +++ b/arch/avr/src/avr32/up_dumpstate.c @@ -49,7 +49,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/avr/src/avr32/up_releasepending.c b/arch/avr/src/avr32/up_releasepending.c index e144ca90401..19f0e15ffec 100644 --- a/arch/avr/src/avr32/up_releasepending.c +++ b/arch/avr/src/avr32/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/avr/src/avr32/up_reprioritizertr.c b/arch/avr/src/avr32/up_reprioritizertr.c index 07ee9c6a492..535134d51f3 100644 --- a/arch/avr/src/avr32/up_reprioritizertr.c +++ b/arch/avr/src/avr32/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/avr/src/avr32/up_schedulesigaction.c b/arch/avr/src/avr32/up_schedulesigaction.c index a710672dc65..c877ba2442b 100644 --- a/arch/avr/src/avr32/up_schedulesigaction.c +++ b/arch/avr/src/avr32/up_schedulesigaction.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/avr/src/avr32/up_sigdeliver.c b/arch/avr/src/avr32/up_sigdeliver.c index 7e0d9918ab9..88e3d53921e 100644 --- a/arch/avr/src/avr32/up_sigdeliver.c +++ b/arch/avr/src/avr32/up_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/avr/src/avr32/up_unblocktask.c b/arch/avr/src/avr32/up_unblocktask.c index c124d973324..fbbd00c8eca 100644 --- a/arch/avr/src/avr32/up_unblocktask.c +++ b/arch/avr/src/avr32/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c index 7aac46c2a3c..ee180f17fdf 100644 --- a/arch/avr/src/common/up_assert.c +++ b/arch/avr/src/common/up_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c index db422b410dc..9b89b3a7301 100644 --- a/arch/avr/src/common/up_exit.c +++ b/arch/avr/src/common/up_exit.c @@ -48,7 +48,7 @@ #endif #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/hc/src/common/up_blocktask.c b/arch/hc/src/common/up_blocktask.c index 58dd3360ce5..450a1cebc89 100644 --- a/arch/hc/src/common/up_blocktask.c +++ b/arch/hc/src/common/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c index 1e8bdca2e80..507d69b34f5 100644 --- a/arch/hc/src/common/up_exit.c +++ b/arch/hc/src/common/up_exit.c @@ -48,7 +48,7 @@ #endif #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/hc/src/common/up_releasepending.c b/arch/hc/src/common/up_releasepending.c index 7a55254e738..694dfcc1d5c 100644 --- a/arch/hc/src/common/up_releasepending.c +++ b/arch/hc/src/common/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/hc/src/common/up_reprioritizertr.c b/arch/hc/src/common/up_reprioritizertr.c index ee8ed4e3cef..8ed2f60e9d3 100644 --- a/arch/hc/src/common/up_reprioritizertr.c +++ b/arch/hc/src/common/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/hc/src/common/up_unblocktask.c b/arch/hc/src/common/up_unblocktask.c index 379ccdde207..bb232c0bf91 100644 --- a/arch/hc/src/common/up_unblocktask.c +++ b/arch/hc/src/common/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c index 7834d9800ba..89c4c953f90 100644 --- a/arch/hc/src/m9s12/m9s12_assert.c +++ b/arch/hc/src/m9s12/m9s12_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c index 585a667a7c8..abcfbad6ed4 100644 --- a/arch/mips/src/common/up_exit.c +++ b/arch/mips/src/common/up_exit.c @@ -50,7 +50,7 @@ #endif #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c index da789ad819a..a5af9dabcc3 100644 --- a/arch/mips/src/mips32/up_assert.c +++ b/arch/mips/src/mips32/up_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/mips/src/mips32/up_blocktask.c b/arch/mips/src/mips32/up_blocktask.c index 62c0c126ebd..756b2f24ff4 100644 --- a/arch/mips/src/mips32/up_blocktask.c +++ b/arch/mips/src/mips32/up_blocktask.c @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/mips/src/mips32/up_dumpstate.c b/arch/mips/src/mips32/up_dumpstate.c index dc2a50d29cf..f4b35e54d5d 100644 --- a/arch/mips/src/mips32/up_dumpstate.c +++ b/arch/mips/src/mips32/up_dumpstate.c @@ -49,7 +49,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/mips/src/mips32/up_releasepending.c b/arch/mips/src/mips32/up_releasepending.c index 1c2ac638db7..8823d34935f 100644 --- a/arch/mips/src/mips32/up_releasepending.c +++ b/arch/mips/src/mips32/up_releasepending.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/mips/src/mips32/up_reprioritizertr.c b/arch/mips/src/mips32/up_reprioritizertr.c index 71a082fd883..1d957e2c22f 100644 --- a/arch/mips/src/mips32/up_reprioritizertr.c +++ b/arch/mips/src/mips32/up_reprioritizertr.c @@ -47,7 +47,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/mips/src/mips32/up_schedulesigaction.c b/arch/mips/src/mips32/up_schedulesigaction.c index 1ab8c2b5627..1173bf2c400 100644 --- a/arch/mips/src/mips32/up_schedulesigaction.c +++ b/arch/mips/src/mips32/up_schedulesigaction.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/mips/src/mips32/up_sigdeliver.c b/arch/mips/src/mips32/up_sigdeliver.c index 7ad80f733ff..97c7861844c 100644 --- a/arch/mips/src/mips32/up_sigdeliver.c +++ b/arch/mips/src/mips32/up_sigdeliver.c @@ -48,7 +48,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/mips/src/mips32/up_unblocktask.c b/arch/mips/src/mips32/up_unblocktask.c index 470942b846c..16da9ab814e 100644 --- a/arch/mips/src/mips32/up_unblocktask.c +++ b/arch/mips/src/mips32/up_unblocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/mips/src/mips32/up_vfork.c b/arch/mips/src/mips32/up_vfork.c index af76c0779fd..948abefb375 100644 --- a/arch/mips/src/mips32/up_vfork.c +++ b/arch/mips/src/mips32/up_vfork.c @@ -50,7 +50,7 @@ #include #include "up_vfork.h" -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/rgmp/src/nuttx.c b/arch/rgmp/src/nuttx.c index 2b20cad6481..029263ea70b 100644 --- a/arch/rgmp/src/nuttx.c +++ b/arch/rgmp/src/nuttx.c @@ -54,7 +54,7 @@ #include #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" struct tcb_s *current_task = NULL; diff --git a/arch/rgmp/src/rgmp.c b/arch/rgmp/src/rgmp.c index 652e11cca07..177e452c0e7 100644 --- a/arch/rgmp/src/rgmp.c +++ b/arch/rgmp/src/rgmp.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include int nest_irq = 0; diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c index 77dfae286e4..1aab5b7eec9 100644 --- a/arch/sh/src/common/up_assert.c +++ b/arch/sh/src/common/up_assert.c @@ -51,7 +51,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sh/src/common/up_blocktask.c b/arch/sh/src/common/up_blocktask.c index 81e1789fc13..0cfe03267d2 100644 --- a/arch/sh/src/common/up_blocktask.c +++ b/arch/sh/src/common/up_blocktask.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c index bdb1c520e92..bfe56dcb766 100644 --- a/arch/sh/src/common/up_exit.c +++ b/arch/sh/src/common/up_exit.c @@ -49,7 +49,7 @@ #endif #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sh/src/common/up_releasepending.c b/arch/sh/src/common/up_releasepending.c index f1cde5075fb..b4685ded9b7 100644 --- a/arch/sh/src/common/up_releasepending.c +++ b/arch/sh/src/common/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sh/src/common/up_reprioritizertr.c b/arch/sh/src/common/up_reprioritizertr.c index 8ef6c06c466..93a577a92e6 100644 --- a/arch/sh/src/common/up_reprioritizertr.c +++ b/arch/sh/src/common/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sh/src/common/up_unblocktask.c b/arch/sh/src/common/up_unblocktask.c index 3978594cf6e..04832386fe2 100644 --- a/arch/sh/src/common/up_unblocktask.c +++ b/arch/sh/src/common/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/sh/src/m16c/m16c_dumpstate.c index d0ee37b0455..41363322e77 100644 --- a/arch/sh/src/m16c/m16c_dumpstate.c +++ b/arch/sh/src/m16c/m16c_dumpstate.c @@ -47,7 +47,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #include "chip.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/sh/src/m16c/m16c_schedulesigaction.c b/arch/sh/src/m16c/m16c_schedulesigaction.c index d7af7e47798..fc4fd0b7b2f 100644 --- a/arch/sh/src/m16c/m16c_schedulesigaction.c +++ b/arch/sh/src/m16c/m16c_schedulesigaction.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/sh/src/m16c/m16c_sigdeliver.c b/arch/sh/src/m16c/m16c_sigdeliver.c index 003dde8ab51..ddfae0f2c5d 100644 --- a/arch/sh/src/m16c/m16c_sigdeliver.c +++ b/arch/sh/src/m16c/m16c_sigdeliver.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/sh/src/sh1/sh1_dumpstate.c index 849c406df25..5472261b3fd 100644 --- a/arch/sh/src/sh1/sh1_dumpstate.c +++ b/arch/sh/src/sh1/sh1_dumpstate.c @@ -47,7 +47,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "os_internal.h" +#include "sched/sched.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/sh/src/sh1/sh1_schedulesigaction.c b/arch/sh/src/sh1/sh1_schedulesigaction.c index 1c05d669c32..22649b71ac1 100644 --- a/arch/sh/src/sh1/sh1_schedulesigaction.c +++ b/arch/sh/src/sh1/sh1_schedulesigaction.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/sh/src/sh1/sh1_sigdeliver.c b/arch/sh/src/sh1/sh1_sigdeliver.c index 00c7fd3407b..b8cdfd5021c 100644 --- a/arch/sh/src/sh1/sh1_sigdeliver.c +++ b/arch/sh/src/sh1/sh1_sigdeliver.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/sim/src/up_blocktask.c b/arch/sim/src/up_blocktask.c index 6e0f9401509..ef1e940f04a 100644 --- a/arch/sim/src/up_blocktask.c +++ b/arch/sim/src/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/up_exit.c index b70a9115450..332d1ff61da 100644 --- a/arch/sim/src/up_exit.c +++ b/arch/sim/src/up_exit.c @@ -45,7 +45,7 @@ #include #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sim/src/up_releasepending.c b/arch/sim/src/up_releasepending.c index a1c2eb54430..4859ef33269 100644 --- a/arch/sim/src/up_releasepending.c +++ b/arch/sim/src/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sim/src/up_reprioritizertr.c b/arch/sim/src/up_reprioritizertr.c index 578fd5a97b5..4abb3480285 100644 --- a/arch/sim/src/up_reprioritizertr.c +++ b/arch/sim/src/up_reprioritizertr.c @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sim/src/up_schedulesigaction.c b/arch/sim/src/up_schedulesigaction.c index 485f720cade..11c7bdde9fc 100644 --- a/arch/sim/src/up_schedulesigaction.c +++ b/arch/sim/src/up_schedulesigaction.c @@ -44,7 +44,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/sim/src/up_unblocktask.c b/arch/sim/src/up_unblocktask.c index 66f7a6d34fc..42f943352e3 100644 --- a/arch/sim/src/up_unblocktask.c +++ b/arch/sim/src/up_unblocktask.c @@ -44,7 +44,7 @@ #include #include "clock/clock.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c index ed9b0cdb22f..30aee2b23da 100644 --- a/arch/x86/src/common/up_assert.c +++ b/arch/x86/src/common/up_assert.c @@ -52,7 +52,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/x86/src/common/up_blocktask.c b/arch/x86/src/common/up_blocktask.c index f436c006f75..b0a11790b29 100644 --- a/arch/x86/src/common/up_blocktask.c +++ b/arch/x86/src/common/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c index bf2548214bd..8af643fcdb1 100644 --- a/arch/x86/src/common/up_exit.c +++ b/arch/x86/src/common/up_exit.c @@ -48,7 +48,7 @@ #endif #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/x86/src/common/up_releasepending.c b/arch/x86/src/common/up_releasepending.c index 9507ff8982e..2f7db761820 100644 --- a/arch/x86/src/common/up_releasepending.c +++ b/arch/x86/src/common/up_releasepending.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/x86/src/common/up_reprioritizertr.c b/arch/x86/src/common/up_reprioritizertr.c index 3c5115b72e3..5579ad34987 100644 --- a/arch/x86/src/common/up_reprioritizertr.c +++ b/arch/x86/src/common/up_reprioritizertr.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/x86/src/common/up_unblocktask.c b/arch/x86/src/common/up_unblocktask.c index 89dcf5418c0..67781357567 100644 --- a/arch/x86/src/common/up_unblocktask.c +++ b/arch/x86/src/common/up_unblocktask.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/x86/src/i486/up_schedulesigaction.c b/arch/x86/src/i486/up_schedulesigaction.c index 1eb773ce899..150324eceb2 100644 --- a/arch/x86/src/i486/up_schedulesigaction.c +++ b/arch/x86/src/i486/up_schedulesigaction.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/x86/src/i486/up_sigdeliver.c b/arch/x86/src/i486/up_sigdeliver.c index 1e87e78c6b4..15a33380d03 100644 --- a/arch/x86/src/i486/up_sigdeliver.c +++ b/arch/x86/src/i486/up_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #include "up_arch.h" diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c index 051d8ca019c..df7121c0400 100644 --- a/arch/z16/src/common/up_assert.c +++ b/arch/z16/src/common/up_assert.c @@ -51,7 +51,7 @@ #include #include "chip/chip.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z16/src/common/up_blocktask.c b/arch/z16/src/common/up_blocktask.c index c8a8fae99c1..b4728fd78dd 100644 --- a/arch/z16/src/common/up_blocktask.c +++ b/arch/z16/src/common/up_blocktask.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c index 99d50bab832..66a60645658 100644 --- a/arch/z16/src/common/up_exit.c +++ b/arch/z16/src/common/up_exit.c @@ -50,7 +50,7 @@ #include "chip/chip.h" #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z16/src/common/up_releasepending.c b/arch/z16/src/common/up_releasepending.c index 7db0cd61421..8e9c95cd6b8 100644 --- a/arch/z16/src/common/up_releasepending.c +++ b/arch/z16/src/common/up_releasepending.c @@ -45,7 +45,7 @@ #include #include "chip/chip.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z16/src/common/up_reprioritizertr.c b/arch/z16/src/common/up_reprioritizertr.c index 456d39010a0..27052396cde 100644 --- a/arch/z16/src/common/up_reprioritizertr.c +++ b/arch/z16/src/common/up_reprioritizertr.c @@ -47,7 +47,7 @@ #include #include "chip/chip.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z16/src/common/up_schedulesigaction.c b/arch/z16/src/common/up_schedulesigaction.c index b241d0a5b1b..a56ce322a24 100644 --- a/arch/z16/src/common/up_schedulesigaction.c +++ b/arch/z16/src/common/up_schedulesigaction.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z16/src/common/up_sigdeliver.c b/arch/z16/src/common/up_sigdeliver.c index bc72fd56ad2..284f7dce4b3 100644 --- a/arch/z16/src/common/up_sigdeliver.c +++ b/arch/z16/src/common/up_sigdeliver.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c index fd16cf23885..a1271b2d9f1 100644 --- a/arch/z16/src/common/up_stackdump.c +++ b/arch/z16/src/common/up_stackdump.c @@ -42,7 +42,7 @@ #include #include "chip/chip.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z16/src/common/up_unblocktask.c b/arch/z16/src/common/up_unblocktask.c index fab6e9a84c6..44988f76b94 100644 --- a/arch/z16/src/common/up_unblocktask.c +++ b/arch/z16/src/common/up_unblocktask.c @@ -45,7 +45,7 @@ #include #include "chip/chip.h" -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c index 55561db331e..4734232623b 100644 --- a/arch/z80/src/common/up_assert.c +++ b/arch/z80/src/common/up_assert.c @@ -50,7 +50,7 @@ #include "chip/chip.h" #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/up_blocktask.c b/arch/z80/src/common/up_blocktask.c index 418a09cc072..dd037ca9ab7 100644 --- a/arch/z80/src/common/up_blocktask.c +++ b/arch/z80/src/common/up_blocktask.c @@ -46,7 +46,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c index 124ee103547..fb79e364104 100644 --- a/arch/z80/src/common/up_exit.c +++ b/arch/z80/src/common/up_exit.c @@ -51,7 +51,7 @@ #include "chip/chip.h" #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/up_releasepending.c b/arch/z80/src/common/up_releasepending.c index 81a2f24132a..6acc6f76018 100644 --- a/arch/z80/src/common/up_releasepending.c +++ b/arch/z80/src/common/up_releasepending.c @@ -46,7 +46,7 @@ #include "chip/chip.h" #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/up_reprioritizertr.c index 0f0ca2fb68e..c470c086302 100644 --- a/arch/z80/src/common/up_reprioritizertr.c +++ b/arch/z80/src/common/up_reprioritizertr.c @@ -48,7 +48,7 @@ #include "chip/chip.h" #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c index 21707889b59..93dfb7291db 100644 --- a/arch/z80/src/common/up_stackdump.c +++ b/arch/z80/src/common/up_stackdump.c @@ -43,7 +43,7 @@ #include #include "up_arch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/up_unblocktask.c b/arch/z80/src/common/up_unblocktask.c index 3ce1e5a1727..688bb03f1e7 100644 --- a/arch/z80/src/common/up_unblocktask.c +++ b/arch/z80/src/common/up_unblocktask.c @@ -46,7 +46,7 @@ #include "chip/chip.h" #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "up_internal.h" diff --git a/arch/z80/src/ez80/ez80_schedulesigaction.c b/arch/z80/src/ez80/ez80_schedulesigaction.c index c519fb18bfa..6f2a19f4774 100644 --- a/arch/z80/src/ez80/ez80_schedulesigaction.c +++ b/arch/z80/src/ez80/ez80_schedulesigaction.c @@ -47,7 +47,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z80/src/ez80/ez80_sigdeliver.c b/arch/z80/src/ez80/ez80_sigdeliver.c index 0f2409b9ca0..797f4a745a6 100644 --- a/arch/z80/src/ez80/ez80_sigdeliver.c +++ b/arch/z80/src/ez80/ez80_sigdeliver.c @@ -47,7 +47,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c index 39344e51fb0..e0bd1b05018 100644 --- a/arch/z80/src/z180/z180_schedulesigaction.c +++ b/arch/z80/src/z180/z180_schedulesigaction.c @@ -47,7 +47,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z80/src/z180/z180_sigdeliver.c b/arch/z80/src/z180/z180_sigdeliver.c index bd28980def1..44de18fcb1c 100644 --- a/arch/z80/src/z180/z180_sigdeliver.c +++ b/arch/z80/src/z180/z180_sigdeliver.c @@ -46,7 +46,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c index daae090089c..c7f3084544c 100644 --- a/arch/z80/src/z8/z8_schedulesigaction.c +++ b/arch/z80/src/z8/z8_schedulesigaction.c @@ -47,7 +47,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z80/src/z8/z8_sigdeliver.c b/arch/z80/src/z8/z8_sigdeliver.c index b2e11b08074..099b511dbac 100644 --- a/arch/z80/src/z8/z8_sigdeliver.c +++ b/arch/z80/src/z8/z8_sigdeliver.c @@ -46,7 +46,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c index 8935897262f..cac85781b3b 100644 --- a/arch/z80/src/z80/z80_schedulesigaction.c +++ b/arch/z80/src/z80/z80_schedulesigaction.c @@ -47,7 +47,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/arch/z80/src/z80/z80_sigdeliver.c b/arch/z80/src/z80/z80_sigdeliver.c index c6355097f7e..c16f37242c3 100644 --- a/arch/z80/src/z80/z80_sigdeliver.c +++ b/arch/z80/src/z80/z80_sigdeliver.c @@ -46,7 +46,7 @@ #include #include "chip/switch.h" -#include "os_internal.h" +#include "sched/sched.h" #include "up_internal.h" #ifndef CONFIG_DISABLE_SIGNALS diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c index c984903599c..13c69201888 100644 --- a/binfmt/binfmt_execmodule.c +++ b/binfmt/binfmt_execmodule.c @@ -50,7 +50,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "binfmt_internal.h" #ifndef CONFIG_BINFMT_DISABLE diff --git a/sched/environ/env_clearenv.c b/sched/environ/env_clearenv.c index 832d6d8adbc..e45939ce0e5 100644 --- a/sched/environ/env_clearenv.c +++ b/sched/environ/env_clearenv.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "environ/environ.h" /**************************************************************************** diff --git a/sched/environ/env_dup.c b/sched/environ/env_dup.c index fc529eafe46..91dcaa1dca8 100644 --- a/sched/environ/env_dup.c +++ b/sched/environ/env_dup.c @@ -48,7 +48,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "environ/environ.h" /**************************************************************************** diff --git a/sched/environ/env_getenv.c b/sched/environ/env_getenv.c index 6a030e3f6d2..51f886fe0fe 100644 --- a/sched/environ/env_getenv.c +++ b/sched/environ/env_getenv.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "environ/environ.h" /**************************************************************************** diff --git a/sched/environ/env_getenvironptr.c b/sched/environ/env_getenvironptr.c index 5808dc5dda2..f56a08a1b00 100644 --- a/sched/environ/env_getenvironptr.c +++ b/sched/environ/env_getenvironptr.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #undef get_environ_ptr diff --git a/sched/environ/env_setenv.c b/sched/environ/env_setenv.c index bdf87a9c5f8..c00efb3049b 100644 --- a/sched/environ/env_setenv.c +++ b/sched/environ/env_setenv.c @@ -49,7 +49,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "environ/environ.h" /**************************************************************************** diff --git a/sched/environ/env_unsetenv.c b/sched/environ/env_unsetenv.c index 70bd0488141..5ed1ed69708 100644 --- a/sched/environ/env_unsetenv.c +++ b/sched/environ/env_unsetenv.c @@ -47,7 +47,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "environ/environ.h" /**************************************************************************** diff --git a/sched/errno/errno_getptr.c b/sched/errno/errno_getptr.c index 50b1e085e1f..50a753d021d 100644 --- a/sched/errno/errno_getptr.c +++ b/sched/errno/errno_getptr.c @@ -41,7 +41,7 @@ #include #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/sched/exit.c b/sched/exit.c index db922d89f03..85cc99cba3f 100644 --- a/sched/exit.c +++ b/sched/exit.c @@ -47,7 +47,7 @@ #include #include "task/task.h" -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Pre-processor Definitions diff --git a/sched/group/group_childstatus.c b/sched/group/group_childstatus.c index bac8dac9fe9..d67aad6067c 100644 --- a/sched/group/group_childstatus.c +++ b/sched/group/group_childstatus.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #if defined(CONFIG_SCHED_HAVE_PARENT) && defined(CONFIG_SCHED_CHILD_STATUS) diff --git a/sched/group/group_setuptaskfiles.c b/sched/group/group_setuptaskfiles.c index 91b4bf218b7..978dc4400e6 100644 --- a/sched/group/group_setuptaskfiles.c +++ b/sched/group/group_setuptaskfiles.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #if CONFIG_NFILE_DESCRIPTORS > 0 || CONFIG_NSOCKET_DESCRIPTORS > 0 diff --git a/sched/group/group_signal.c b/sched/group/group_signal.c index b1fafdc57dd..4569fdb9c70 100644 --- a/sched/group/group_signal.c +++ b/sched/group/group_signal.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "signal/signal.h" diff --git a/sched/init/os_start.c b/sched/init/os_start.c index 57ef6d5fa27..be319ca02c1 100644 --- a/sched/init/os_start.c +++ b/sched/init/os_start.c @@ -51,7 +51,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" #include "wdog/wdog.h" #include "semaphore/semaphore.h" diff --git a/sched/mqueue/mq_close.c b/sched/mqueue/mq_close.c index 237754173cc..36caf05ebde 100644 --- a/sched/mqueue/mq_close.c +++ b/sched/mqueue/mq_close.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "mqueue/mqueue.h" /**************************************************************************** diff --git a/sched/mqueue/mq_notify.c b/sched/mqueue/mq_notify.c index ffb159af0ba..891cb46f4df 100644 --- a/sched/mqueue/mq_notify.c +++ b/sched/mqueue/mq_notify.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "mqueue/mqueue.h" /************************************************************************ diff --git a/sched/mqueue/mq_open.c b/sched/mqueue/mq_open.c index e117617360a..c7de6c7455e 100644 --- a/sched/mqueue/mq_open.c +++ b/sched/mqueue/mq_open.c @@ -51,7 +51,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "mqueue/mqueue.h" /**************************************************************************** diff --git a/sched/mqueue/mq_rcvinternal.c b/sched/mqueue/mq_rcvinternal.c index ecd45134406..9a355aa0b9d 100644 --- a/sched/mqueue/mq_rcvinternal.c +++ b/sched/mqueue/mq_rcvinternal.c @@ -50,7 +50,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "mqueue/mqueue.h" /**************************************************************************** diff --git a/sched/mqueue/mq_sndinternal.c b/sched/mqueue/mq_sndinternal.c index 270f5ab7abf..033b2095ca3 100644 --- a/sched/mqueue/mq_sndinternal.c +++ b/sched/mqueue/mq_sndinternal.c @@ -51,7 +51,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #ifndef CONFIG_DISABLE_SIGNALS # include "signal/signal.h" #endif diff --git a/sched/mqueue/mq_timedreceive.c b/sched/mqueue/mq_timedreceive.c index 9ff42c86dc9..a0fc97860dc 100644 --- a/sched/mqueue/mq_timedreceive.c +++ b/sched/mqueue/mq_timedreceive.c @@ -50,7 +50,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "mqueue/mqueue.h" diff --git a/sched/mqueue/mq_timedsend.c b/sched/mqueue/mq_timedsend.c index 3174c341bde..d78b720b71a 100644 --- a/sched/mqueue/mq_timedsend.c +++ b/sched/mqueue/mq_timedsend.c @@ -50,7 +50,7 @@ #include #include "clock/clock.h" -#include "os_internal.h" +#include "sched/sched.h" #include "mqueue/mqueue.h" /**************************************************************************** diff --git a/sched/paging/pg_miss.c b/sched/paging/pg_miss.c index f134fc08e33..21717231a60 100644 --- a/sched/paging/pg_miss.c +++ b/sched/paging/pg_miss.c @@ -48,7 +48,7 @@ #ifdef CONFIG_PAGING -#include "os_internal.h" +#include "sched/sched.h" #include "paging/paging.h" /**************************************************************************** diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c index 10e4ba4f3a3..e15320160c4 100644 --- a/sched/paging/pg_worker.c +++ b/sched/paging/pg_worker.c @@ -52,7 +52,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "paging/paging.h" #ifdef CONFIG_PAGING diff --git a/sched/pthread/pthread_cancel.c b/sched/pthread/pthread_cancel.c index 9dea9ad6958..606825b16ee 100644 --- a/sched/pthread/pthread_cancel.c +++ b/sched/pthread/pthread_cancel.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "pthread/pthread.h" /************************************************************************** diff --git a/sched/pthread/pthread_completejoin.c b/sched/pthread/pthread_completejoin.c index e0eceee6a36..0546edf5b54 100644 --- a/sched/pthread/pthread_completejoin.c +++ b/sched/pthread/pthread_completejoin.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "pthread/pthread.h" diff --git a/sched/pthread/pthread_condtimedwait.c b/sched/pthread/pthread_condtimedwait.c index 16cce869007..4505225b258 100644 --- a/sched/pthread/pthread_condtimedwait.c +++ b/sched/pthread/pthread_condtimedwait.c @@ -50,7 +50,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "pthread/pthread.h" #include "clock/clock.h" #include "signal/signal.h" diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c index b3969e4f7ba..9ee5cc5d9c9 100644 --- a/sched/pthread/pthread_create.c +++ b/sched/pthread/pthread_create.c @@ -52,7 +52,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "clock/clock.h" #include "pthread/pthread.h" diff --git a/sched/pthread/pthread_detach.c b/sched/pthread/pthread_detach.c index 95762b6c1a3..450ff76a531 100644 --- a/sched/pthread/pthread_detach.c +++ b/sched/pthread/pthread_detach.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "pthread/pthread.h" diff --git a/sched/pthread/pthread_exit.c b/sched/pthread/pthread_exit.c index ebc7fb2621e..5fb57c8dfce 100644 --- a/sched/pthread/pthread_exit.c +++ b/sched/pthread/pthread_exit.c @@ -49,7 +49,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "task/task.h" #include "pthread/pthread.h" diff --git a/sched/pthread/pthread_getspecific.c b/sched/pthread/pthread_getspecific.c index bc097372b5c..c02dcde3e1b 100644 --- a/sched/pthread/pthread_getspecific.c +++ b/sched/pthread/pthread_getspecific.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "pthread/pthread.h" /************************************************************************ diff --git a/sched/pthread/pthread_join.c b/sched/pthread/pthread_join.c index a9b9d9e885a..43843deed07 100644 --- a/sched/pthread/pthread_join.c +++ b/sched/pthread/pthread_join.c @@ -43,7 +43,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "pthread/pthread.h" diff --git a/sched/pthread/pthread_keycreate.c b/sched/pthread/pthread_keycreate.c index 17ed16144d6..628f0d6af02 100644 --- a/sched/pthread/pthread_keycreate.c +++ b/sched/pthread/pthread_keycreate.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "pthread/pthread.h" /**************************************************************************** diff --git a/sched/pthread/pthread_setcancelstate.c b/sched/pthread/pthread_setcancelstate.c index 7e3c5d84ee9..dcca9f3de66 100644 --- a/sched/pthread/pthread_setcancelstate.c +++ b/sched/pthread/pthread_setcancelstate.c @@ -39,7 +39,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" /****************************************************************************************** * Private Definitions diff --git a/sched/pthread/pthread_setschedprio.c b/sched/pthread/pthread_setschedprio.c index 7144fab96ac..4d8c6c7317c 100644 --- a/sched/pthread/pthread_setschedprio.c +++ b/sched/pthread/pthread_setschedprio.c @@ -42,7 +42,7 @@ #include #include #include -#include "os_internal.h" +#include "sched/sched.h" /**************************************************************************** * Definitions diff --git a/sched/pthread/pthread_setspecific.c b/sched/pthread/pthread_setspecific.c index f4dac80b093..8edd9c675bb 100644 --- a/sched/pthread/pthread_setspecific.c +++ b/sched/pthread/pthread_setspecific.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "pthread/pthread.h" /**************************************************************************** diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c index 82e7e80a354..3f636b835c5 100644 --- a/sched/semaphore/sem_holder.c +++ b/sched/semaphore/sem_holder.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "semaphore/semaphore.h" #ifdef CONFIG_PRIORITY_INHERITANCE diff --git a/sched/semaphore/sem_post.c b/sched/semaphore/sem_post.c index 50ff4281157..4540160823a 100644 --- a/sched/semaphore/sem_post.c +++ b/sched/semaphore/sem_post.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "semaphore/semaphore.h" /**************************************************************************** diff --git a/sched/semaphore/sem_timedwait.c b/sched/semaphore/sem_timedwait.c index c18ddf3feae..f5053bdf897 100644 --- a/sched/semaphore/sem_timedwait.c +++ b/sched/semaphore/sem_timedwait.c @@ -49,7 +49,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "clock/clock.h" #include "semaphore/semaphore.h" diff --git a/sched/semaphore/sem_trywait.c b/sched/semaphore/sem_trywait.c index 8fe1629a8da..f7f6303a166 100644 --- a/sched/semaphore/sem_trywait.c +++ b/sched/semaphore/sem_trywait.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "semaphore/semaphore.h" /**************************************************************************** diff --git a/sched/semaphore/sem_wait.c b/sched/semaphore/sem_wait.c index e6e896c80d8..6756599fa52 100644 --- a/sched/semaphore/sem_wait.c +++ b/sched/semaphore/sem_wait.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "semaphore/semaphore.h" /**************************************************************************** diff --git a/sched/signal/sig_action.c b/sched/signal/sig_action.c index 055f5ec96b5..e73f7344dc8 100644 --- a/sched/signal/sig_action.c +++ b/sched/signal/sig_action.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "signal/signal.h" diff --git a/sched/signal/sig_dispatch.c b/sched/signal/sig_dispatch.c index e269228634d..1cffefb366c 100644 --- a/sched/signal/sig_dispatch.c +++ b/sched/signal/sig_dispatch.c @@ -48,7 +48,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "semaphore/semaphore.h" #include "signal/signal.h" diff --git a/sched/signal/sig_kill.c b/sched/signal/sig_kill.c index cceb38fe564..3a65535e741 100644 --- a/sched/signal/sig_kill.c +++ b/sched/signal/sig_kill.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" /************************************************************************ diff --git a/sched/signal/sig_mqnotempty.c b/sched/signal/sig_mqnotempty.c index bee8270d608..6516a72113b 100644 --- a/sched/signal/sig_mqnotempty.c +++ b/sched/signal/sig_mqnotempty.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" /**************************************************************************** diff --git a/sched/signal/sig_pending.c b/sched/signal/sig_pending.c index 5dadaca68af..a1fa4169872 100644 --- a/sched/signal/sig_pending.c +++ b/sched/signal/sig_pending.c @@ -42,7 +42,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" /**************************************************************************** diff --git a/sched/signal/sig_procmask.c b/sched/signal/sig_procmask.c index 6a74c6fa7ed..c56fdf5aa4e 100644 --- a/sched/signal/sig_procmask.c +++ b/sched/signal/sig_procmask.c @@ -49,7 +49,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" /**************************************************************************** diff --git a/sched/signal/sig_queue.c b/sched/signal/sig_queue.c index 2933e7140ed..2cc46142e38 100644 --- a/sched/signal/sig_queue.c +++ b/sched/signal/sig_queue.c @@ -45,7 +45,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" /**************************************************************************** diff --git a/sched/signal/sig_suspend.c b/sched/signal/sig_suspend.c index 809f43b0b7b..7e9ad11b4f1 100644 --- a/sched/signal/sig_suspend.c +++ b/sched/signal/sig_suspend.c @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" /**************************************************************************** diff --git a/sched/signal/sig_timedwait.c b/sched/signal/sig_timedwait.c index a71b78c6b54..e592f8e2e78 100644 --- a/sched/signal/sig_timedwait.c +++ b/sched/signal/sig_timedwait.c @@ -52,7 +52,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" #include "clock/clock.h" diff --git a/sched/signal/sig_unmaskpendingsignal.c b/sched/signal/sig_unmaskpendingsignal.c index 9fe76762d7b..9ed670bba7b 100644 --- a/sched/signal/sig_unmaskpendingsignal.c +++ b/sched/signal/sig_unmaskpendingsignal.c @@ -41,7 +41,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "signal/signal.h" /************************************************************************ diff --git a/sched/task/task_atexit.c b/sched/task/task_atexit.c index 0365abd628a..cd18e0c5960 100644 --- a/sched/task/task_atexit.c +++ b/sched/task/task_atexit.c @@ -47,7 +47,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "task/task.h" #ifdef CONFIG_SCHED_ATEXIT diff --git a/sched/task/task_create.c b/sched/task/task_create.c index d6663e45cc7..6289085fa5a 100644 --- a/sched/task/task_create.c +++ b/sched/task/task_create.c @@ -48,7 +48,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "task/task.h" diff --git a/sched/task/task_delete.c b/sched/task/task_delete.c index bdae8920890..1cf0c37d265 100644 --- a/sched/task/task_delete.c +++ b/sched/task/task_delete.c @@ -43,7 +43,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "task/task.h" /**************************************************************************** diff --git a/sched/task/task_exit.c b/sched/task/task_exit.c index 838eac46023..71a3233d45f 100644 --- a/sched/task/task_exit.c +++ b/sched/task/task_exit.c @@ -41,7 +41,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #ifndef CONFIG_DISABLE_SIGNALS # include "signal/signal.h" diff --git a/sched/task/task_exithook.c b/sched/task/task_exithook.c index 7d086c52e53..78a44ec50a0 100644 --- a/sched/task/task_exithook.c +++ b/sched/task/task_exithook.c @@ -48,7 +48,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "signal/signal.h" #include "task/task.h" diff --git a/sched/task/task_getgroup.c b/sched/task/task_getgroup.c index abb3e23c51e..0145709c57c 100644 --- a/sched/task/task_getgroup.c +++ b/sched/task/task_getgroup.c @@ -41,7 +41,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "task/task.h" diff --git a/sched/task/task_getpid.c b/sched/task/task_getpid.c index 524dd14867a..7f538bd1b5b 100644 --- a/sched/task/task_getpid.c +++ b/sched/task/task_getpid.c @@ -41,7 +41,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "task/task.h" /************************************************************************ diff --git a/sched/task/task_init.c b/sched/task/task_init.c index a0ff9e75037..f1fa91edf2a 100644 --- a/sched/task/task_init.c +++ b/sched/task/task_init.c @@ -46,7 +46,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "task/task.h" diff --git a/sched/task/task_onexit.c b/sched/task/task_onexit.c index aa131c5aff2..71d67102646 100644 --- a/sched/task/task_onexit.c +++ b/sched/task/task_onexit.c @@ -47,7 +47,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "task/task.h" #ifdef CONFIG_SCHED_ONEXIT diff --git a/sched/task/task_posixspawn.c b/sched/task/task_posixspawn.c index 9d4f8f9a35a..2973cb544d4 100644 --- a/sched/task/task_posixspawn.c +++ b/sched/task/task_posixspawn.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "task/spawn.h" #include "task/task.h" diff --git a/sched/task/task_prctl.c b/sched/task/task_prctl.c index f0f1f2ebb78..b0e00f31639 100644 --- a/sched/task/task_prctl.c +++ b/sched/task/task_prctl.c @@ -47,7 +47,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "task/task.h" /************************************************************************ diff --git a/sched/task/task_reparent.c b/sched/task/task_reparent.c index 81a449bad39..424356457a9 100644 --- a/sched/task/task_reparent.c +++ b/sched/task/task_reparent.c @@ -41,7 +41,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "task/task.h" diff --git a/sched/task/task_restart.c b/sched/task/task_restart.c index dd3a78547fd..a62d723fbd8 100644 --- a/sched/task/task_restart.c +++ b/sched/task/task_restart.c @@ -45,7 +45,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "signal/signal.h" #include "task/task.h" diff --git a/sched/task/task_setup.c b/sched/task/task_setup.c index 89b0ec1d29f..aece0a30e19 100644 --- a/sched/task/task_setup.c +++ b/sched/task/task_setup.c @@ -48,7 +48,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "pthread/pthread.h" #include "group/group.h" #include "task/task.h" diff --git a/sched/task/task_spawn.c b/sched/task/task_spawn.c index 7678455fabd..bc0eef13fb4 100644 --- a/sched/task/task_spawn.c +++ b/sched/task/task_spawn.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "task/spawn.h" #include "task/task.h" diff --git a/sched/task/task_start.c b/sched/task/task_start.c index 653e2794a9c..8cc7973f1f4 100644 --- a/sched/task/task_start.c +++ b/sched/task/task_start.c @@ -46,7 +46,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "task/task.h" /**************************************************************************** diff --git a/sched/task/task_terminate.c b/sched/task/task_terminate.c index 4c41e51e430..510883ce2cc 100644 --- a/sched/task/task_terminate.c +++ b/sched/task/task_terminate.c @@ -47,7 +47,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #ifndef CONFIG_DISABLE_SIGNALS # include "signal/signal.h" #endif diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c index 9636339647b..35f464a21d2 100644 --- a/sched/task/task_vfork.c +++ b/sched/task/task_vfork.c @@ -48,7 +48,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "group/group.h" #include "task/task.h" diff --git a/sched/wdog/wd_cancel.c b/sched/wdog/wd_cancel.c index 6ce3df837d1..9093deed863 100644 --- a/sched/wdog/wd_cancel.c +++ b/sched/wdog/wd_cancel.c @@ -44,7 +44,7 @@ #include #include -#include "os_internal.h" +#include "sched/sched.h" #include "wdog/wdog.h" /**************************************************************************** diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c index a88cdceb676..88df3c276b0 100644 --- a/sched/wdog/wd_start.c +++ b/sched/wdog/wd_start.c @@ -50,7 +50,7 @@ #include -#include "os_internal.h" +#include "sched/sched.h" #include "wdog/wdog.h" /****************************************************************************