diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index 259e14f666..f0e52de3f4 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -290,7 +290,7 @@ struct dspace_s #ifndef CONFIG_DISABLE_PTHREAD struct join_s; /* Forward reference */ - /* Defined in pthread_internal.h */ + /* Defined in sched/pthread/pthread.h */ #endif struct task_group_s diff --git a/sched/Makefile b/sched/Makefile index 3030f3ab5f..3e5b5fbee8 100644 --- a/sched/Makefile +++ b/sched/Makefile @@ -136,31 +136,6 @@ CLOCK_SRCS = clock_initialize.c clock_settime.c clock_gettime.c clock_getres.c CLOCK_SRCS += clock_time2ticks.c clock_abstime2ticks.c clock_ticks2time.c CLOCK_SRCS += clock_gettimeofday.c clock_systimer.c -SIGNAL_SRCS = sig_initialize.c -SIGNAL_SRCS += sig_action.c sig_procmask.c sig_pending.c sig_suspend.c -SIGNAL_SRCS += sig_kill.c sig_queue.c sig_waitinfo.c sig_timedwait.c -SIGNAL_SRCS += sig_findaction.c sig_allocatependingsigaction.c -SIGNAL_SRCS += sig_releasependingsigaction.c sig_unmaskpendingsignal.c -SIGNAL_SRCS += sig_removependingsignal.c sig_releasependingsignal.c sig_lowest.c -SIGNAL_SRCS += sig_mqnotempty.c sig_cleanup.c sig_dispatch.c sig_deliver.c -SIGNAL_SRCS += pause.c - -PTHREAD_SRCS = pthread_create.c pthread_exit.c pthread_join.c pthread_detach.c -PTHREAD_SRCS += pthread_yield.c pthread_getschedparam.c pthread_setschedparam.c -PTHREAD_SRCS += pthread_mutexinit.c pthread_mutexdestroy.c -PTHREAD_SRCS += pthread_mutexlock.c pthread_mutextrylock.c pthread_mutexunlock.c -PTHREAD_SRCS += pthread_condinit.c pthread_conddestroy.c -PTHREAD_SRCS += pthread_condwait.c pthread_condsignal.c pthread_condbroadcast.c -PTHREAD_SRCS += pthread_barrierinit.c pthread_barrierdestroy.c pthread_barrierwait.c -PTHREAD_SRCS += pthread_cancel.c pthread_setcancelstate.c -PTHREAD_SRCS += pthread_keycreate.c pthread_setspecific.c pthread_getspecific.c pthread_keydelete.c -PTHREAD_SRCS += pthread_initialize.c pthread_completejoin.c pthread_findjoininfo.c -PTHREAD_SRCS += pthread_once.c pthread_release.c pthread_setschedprio.c - -ifneq ($(CONFIG_DISABLE_SIGNALS),y) -PTHREAD_SRCS += pthread_condtimedwait.c pthread_kill.c pthread_sigmask.c -endif - SEM_SRCS = sem_initialize.c sem_destroy.c sem_open.c sem_close.c sem_unlink.c SEM_SRCS += sem_wait.c sem_trywait.c sem_timedwait.c sem_post.c sem_findnamed.c @@ -184,15 +159,12 @@ endif IRQ_SRCS = irq_initialize.c irq_attach.c irq_dispatch.c irq_unexpectedisr.c include signal/Make.defs +include pthread/Make.defs include mqueue/Make.defs CSRCS = $(MISC_SRCS) $(TSK_SRCS) $(GRP_SRCS) $(SCHED_SRCS) $(WDOG_SRCS) CSRCS += $(TIME_SRCS) $(SEM_SRCS) $(TIMER_SRCS) $(PGFILL_SRCS) -CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS) $(MQUEUE_SRCS) $(SIGNAL_SRCS) - -ifneq ($(CONFIG_DISABLE_PTHREAD),y) -CSRCS += $(PTHREAD_SRCS) -endif +CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS) $(MQUEUE_SRCS) $(SIGNAL_SRCS) $(PTHREAD_SRCS) ifneq ($(CONFIG_DISABLE_ENVIRON),y) CSRCS += $(ENV_SRCS) diff --git a/sched/group_leave.c b/sched/group_leave.c index 71eded8b10..5c5414f7f7 100644 --- a/sched/group_leave.c +++ b/sched/group_leave.c @@ -50,7 +50,7 @@ #include "env_internal.h" #include "signal/signal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" #include "mqueue/mqueue.h" #include "group_internal.h" diff --git a/sched/os_start.c b/sched/os_start.c index 9963cc3a1a..e5feed4224 100644 --- a/sched/os_start.c +++ b/sched/os_start.c @@ -59,7 +59,7 @@ # include "mqueue/mqueue.h" #endif #ifndef CONFIG_DISABLE_PTHREAD -# include "pthread_internal.h" +# include "pthread/pthread.h" #endif #include "clock_internal.h" #include "timer_internal.h" diff --git a/sched/pthread_internal.h b/sched/pthread/pthread.h similarity index 95% rename from sched/pthread_internal.h rename to sched/pthread/pthread.h index d600e24814..a436bd090c 100644 --- a/sched/pthread_internal.h +++ b/sched/pthread/pthread.h @@ -1,7 +1,7 @@ /**************************************************************************** - * sched/pthread_internal.h + * sched/pthread/pthread.h * - * Copyright (C) 2007-2009, 2011, 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009, 2011, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __SCHED_PTHREAD_INTERNAL_H -#define __SCHED_PTHREAD_INTERNAL_H +#ifndef __SCHED_PTHREAD_PTHREAD_H +#define __SCHED_PTHREAD_PTHREAD_H /**************************************************************************** * Included Files @@ -118,5 +118,5 @@ int pthread_mutexattr_verifytype(int type); } #endif -#endif /* __SCHED_PTHREAD_INTERNAL_H */ +#endif /* __SCHED_PTHREAD_PTHREAD_H */ diff --git a/sched/pthread_barrierdestroy.c b/sched/pthread/pthread_barrierdestroy.c similarity index 100% rename from sched/pthread_barrierdestroy.c rename to sched/pthread/pthread_barrierdestroy.c diff --git a/sched/pthread_barrierinit.c b/sched/pthread/pthread_barrierinit.c similarity index 100% rename from sched/pthread_barrierinit.c rename to sched/pthread/pthread_barrierinit.c diff --git a/sched/pthread_barrierwait.c b/sched/pthread/pthread_barrierwait.c similarity index 100% rename from sched/pthread_barrierwait.c rename to sched/pthread/pthread_barrierwait.c diff --git a/sched/pthread_cancel.c b/sched/pthread/pthread_cancel.c similarity index 99% rename from sched/pthread_cancel.c rename to sched/pthread/pthread_cancel.c index ec464ae15d..1b9e1e5729 100644 --- a/sched/pthread_cancel.c +++ b/sched/pthread/pthread_cancel.c @@ -45,7 +45,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************** * Private Definitions diff --git a/sched/pthread_completejoin.c b/sched/pthread/pthread_completejoin.c similarity index 99% rename from sched/pthread_completejoin.c rename to sched/pthread/pthread_completejoin.c index f3a5928e6e..cfe65176ff 100644 --- a/sched/pthread_completejoin.c +++ b/sched/pthread/pthread_completejoin.c @@ -47,7 +47,7 @@ #include "os_internal.h" #include "group_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************ * Pre-processor Definitions diff --git a/sched/pthread_condbroadcast.c b/sched/pthread/pthread_condbroadcast.c similarity index 99% rename from sched/pthread_condbroadcast.c rename to sched/pthread/pthread_condbroadcast.c index 05f4bb483b..1a7adae66f 100644 --- a/sched/pthread_condbroadcast.c +++ b/sched/pthread/pthread_condbroadcast.c @@ -44,7 +44,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_conddestroy.c b/sched/pthread/pthread_conddestroy.c similarity index 98% rename from sched/pthread_conddestroy.c rename to sched/pthread/pthread_conddestroy.c index 11292e6393..0788aaf934 100644 --- a/sched/pthread_conddestroy.c +++ b/sched/pthread/pthread_conddestroy.c @@ -42,7 +42,7 @@ #include #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Global Functions diff --git a/sched/pthread_condinit.c b/sched/pthread/pthread_condinit.c similarity index 99% rename from sched/pthread_condinit.c rename to sched/pthread/pthread_condinit.c index e49bb86588..84f7d04052 100644 --- a/sched/pthread_condinit.c +++ b/sched/pthread/pthread_condinit.c @@ -43,7 +43,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Global Functions diff --git a/sched/pthread_condsignal.c b/sched/pthread/pthread_condsignal.c similarity index 99% rename from sched/pthread_condsignal.c rename to sched/pthread/pthread_condsignal.c index c7120d1044..5a6995b376 100644 --- a/sched/pthread_condsignal.c +++ b/sched/pthread/pthread_condsignal.c @@ -43,7 +43,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_condtimedwait.c b/sched/pthread/pthread_condtimedwait.c similarity index 99% rename from sched/pthread_condtimedwait.c rename to sched/pthread/pthread_condtimedwait.c index 0a53918b89..3cc4dc4eed 100644 --- a/sched/pthread_condtimedwait.c +++ b/sched/pthread/pthread_condtimedwait.c @@ -51,7 +51,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" #include "clock_internal.h" #include "signal/signal.h" diff --git a/sched/pthread_condwait.c b/sched/pthread/pthread_condwait.c similarity index 99% rename from sched/pthread_condwait.c rename to sched/pthread/pthread_condwait.c index bf0164d2d6..9665193f5d 100644 --- a/sched/pthread_condwait.c +++ b/sched/pthread/pthread_condwait.c @@ -45,7 +45,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_create.c b/sched/pthread/pthread_create.c similarity index 99% rename from sched/pthread_create.c rename to sched/pthread/pthread_create.c index 78142a6ed1..1484ef6341 100644 --- a/sched/pthread_create.c +++ b/sched/pthread/pthread_create.c @@ -55,7 +55,7 @@ #include "os_internal.h" #include "group_internal.h" #include "clock_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Pre-processor Definitions diff --git a/sched/pthread_detach.c b/sched/pthread/pthread_detach.c similarity index 99% rename from sched/pthread_detach.c rename to sched/pthread/pthread_detach.c index 78c0e4f94e..5b7f4a6111 100644 --- a/sched/pthread_detach.c +++ b/sched/pthread/pthread_detach.c @@ -48,7 +48,7 @@ #include "os_internal.h" #include "group_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************ * Pre-processor Definitions diff --git a/sched/pthread_exit.c b/sched/pthread/pthread_exit.c similarity index 99% rename from sched/pthread_exit.c rename to sched/pthread/pthread_exit.c index da4a6d149d..8e5c39670a 100644 --- a/sched/pthread_exit.c +++ b/sched/pthread/pthread_exit.c @@ -50,7 +50,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************ * Definitions diff --git a/sched/pthread_findjoininfo.c b/sched/pthread/pthread_findjoininfo.c similarity index 99% rename from sched/pthread_findjoininfo.c rename to sched/pthread/pthread_findjoininfo.c index 8bcb4e4074..0f49becfee 100644 --- a/sched/pthread_findjoininfo.c +++ b/sched/pthread/pthread_findjoininfo.c @@ -42,7 +42,7 @@ #include #include "group_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************ * Definitions diff --git a/sched/pthread_getschedparam.c b/sched/pthread/pthread_getschedparam.c similarity index 99% rename from sched/pthread_getschedparam.c rename to sched/pthread/pthread_getschedparam.c index c376fd4008..9c0743020f 100644 --- a/sched/pthread_getschedparam.c +++ b/sched/pthread/pthread_getschedparam.c @@ -42,7 +42,7 @@ #include #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_getspecific.c b/sched/pthread/pthread_getspecific.c similarity index 99% rename from sched/pthread_getspecific.c rename to sched/pthread/pthread_getspecific.c index 1c87c29ebf..dbed372d5b 100644 --- a/sched/pthread_getspecific.c +++ b/sched/pthread/pthread_getspecific.c @@ -45,7 +45,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************ * Definitions diff --git a/sched/pthread_initialize.c b/sched/pthread/pthread_initialize.c similarity index 99% rename from sched/pthread_initialize.c rename to sched/pthread/pthread_initialize.c index 71b13ebdca..cde71429e0 100644 --- a/sched/pthread_initialize.c +++ b/sched/pthread/pthread_initialize.c @@ -43,7 +43,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_join.c b/sched/pthread/pthread_join.c similarity index 99% rename from sched/pthread_join.c rename to sched/pthread/pthread_join.c index 7db3323273..3aeb133f39 100644 --- a/sched/pthread_join.c +++ b/sched/pthread/pthread_join.c @@ -45,7 +45,7 @@ #include "os_internal.h" #include "group_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Pre-processor Definitions diff --git a/sched/pthread_keycreate.c b/sched/pthread/pthread_keycreate.c similarity index 99% rename from sched/pthread_keycreate.c rename to sched/pthread/pthread_keycreate.c index f9845960d0..9d0e8f4e76 100644 --- a/sched/pthread_keycreate.c +++ b/sched/pthread/pthread_keycreate.c @@ -45,7 +45,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_keydelete.c b/sched/pthread/pthread_keydelete.c similarity index 99% rename from sched/pthread_keydelete.c rename to sched/pthread/pthread_keydelete.c index 0cbf950c0d..f70a15cbb5 100644 --- a/sched/pthread_keydelete.c +++ b/sched/pthread/pthread_keydelete.c @@ -43,7 +43,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************ * Definitions diff --git a/sched/pthread_kill.c b/sched/pthread/pthread_kill.c similarity index 100% rename from sched/pthread_kill.c rename to sched/pthread/pthread_kill.c diff --git a/sched/pthread_mutexdestroy.c b/sched/pthread/pthread_mutexdestroy.c similarity index 99% rename from sched/pthread_mutexdestroy.c rename to sched/pthread/pthread_mutexdestroy.c index f663585341..ddbd662961 100644 --- a/sched/pthread_mutexdestroy.c +++ b/sched/pthread/pthread_mutexdestroy.c @@ -45,7 +45,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_mutexinit.c b/sched/pthread/pthread_mutexinit.c similarity index 99% rename from sched/pthread_mutexinit.c rename to sched/pthread/pthread_mutexinit.c index 265f014e34..08715d4b06 100644 --- a/sched/pthread_mutexinit.c +++ b/sched/pthread/pthread_mutexinit.c @@ -44,7 +44,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_mutexlock.c b/sched/pthread/pthread_mutexlock.c similarity index 99% rename from sched/pthread_mutexlock.c rename to sched/pthread/pthread_mutexlock.c index d4e4237a54..2e786ad7db 100644 --- a/sched/pthread_mutexlock.c +++ b/sched/pthread/pthread_mutexlock.c @@ -45,7 +45,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_mutextrylock.c b/sched/pthread/pthread_mutextrylock.c similarity index 99% rename from sched/pthread_mutextrylock.c rename to sched/pthread/pthread_mutextrylock.c index d88012b51c..a289bf8c3c 100644 --- a/sched/pthread_mutextrylock.c +++ b/sched/pthread/pthread_mutextrylock.c @@ -46,7 +46,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_mutexunlock.c b/sched/pthread/pthread_mutexunlock.c similarity index 99% rename from sched/pthread_mutexunlock.c rename to sched/pthread/pthread_mutexunlock.c index 0a3757e98e..04a02af9c8 100644 --- a/sched/pthread_mutexunlock.c +++ b/sched/pthread/pthread_mutexunlock.c @@ -45,7 +45,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_once.c b/sched/pthread/pthread_once.c similarity index 100% rename from sched/pthread_once.c rename to sched/pthread/pthread_once.c diff --git a/sched/pthread_release.c b/sched/pthread/pthread_release.c similarity index 99% rename from sched/pthread_release.c rename to sched/pthread/pthread_release.c index c66ff5187e..b6afb5a2e5 100644 --- a/sched/pthread_release.c +++ b/sched/pthread/pthread_release.c @@ -43,7 +43,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /************************************************************************ * Definitions diff --git a/sched/pthread_setcancelstate.c b/sched/pthread/pthread_setcancelstate.c similarity index 100% rename from sched/pthread_setcancelstate.c rename to sched/pthread/pthread_setcancelstate.c diff --git a/sched/pthread_setschedparam.c b/sched/pthread/pthread_setschedparam.c similarity index 99% rename from sched/pthread_setschedparam.c rename to sched/pthread/pthread_setschedparam.c index 019a7c7a5d..3b24eb7f8d 100644 --- a/sched/pthread_setschedparam.c +++ b/sched/pthread/pthread_setschedparam.c @@ -43,7 +43,7 @@ #include #include -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_setschedprio.c b/sched/pthread/pthread_setschedprio.c similarity index 100% rename from sched/pthread_setschedprio.c rename to sched/pthread/pthread_setschedprio.c diff --git a/sched/pthread_setspecific.c b/sched/pthread/pthread_setspecific.c similarity index 99% rename from sched/pthread_setspecific.c rename to sched/pthread/pthread_setspecific.c index 16401fbe67..32a26224f5 100644 --- a/sched/pthread_setspecific.c +++ b/sched/pthread/pthread_setspecific.c @@ -45,7 +45,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" /**************************************************************************** * Definitions diff --git a/sched/pthread_sigmask.c b/sched/pthread/pthread_sigmask.c similarity index 100% rename from sched/pthread_sigmask.c rename to sched/pthread/pthread_sigmask.c diff --git a/sched/pthread_yield.c b/sched/pthread/pthread_yield.c similarity index 100% rename from sched/pthread_yield.c rename to sched/pthread/pthread_yield.c diff --git a/sched/signal/sig_action.c b/sched/signal/sig_action.c index bd17e4f9f4..6f07226cf8 100644 --- a/sched/signal/sig_action.c +++ b/sched/signal/sig_action.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_action.c + * sched/signal/sig_action.c * * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_allocatependingsigaction.c b/sched/signal/sig_allocatependingsigaction.c index fa8236ee8e..8fadfc97a9 100644 --- a/sched/signal/sig_allocatependingsigaction.c +++ b/sched/signal/sig_allocatependingsigaction.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_allocatependingsigaction.c + * sched/signal/sig_allocatependingsigaction.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_cleanup.c b/sched/signal/sig_cleanup.c index 535c6273a2..7848c12f41 100644 --- a/sched/signal/sig_cleanup.c +++ b/sched/signal/sig_cleanup.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_cleanup.c + * sched/signal/sig_cleanup.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_deliver.c b/sched/signal/sig_deliver.c index 6e40db1790..442e6c61d0 100644 --- a/sched/signal/sig_deliver.c +++ b/sched/signal/sig_deliver.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_deliver.c + * sched/signal/sig_deliver.c * * Copyright (C) 2007, 2008, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_dispatch.c b/sched/signal/sig_dispatch.c index 6cada00af9..af5339743f 100644 --- a/sched/signal/sig_dispatch.c +++ b/sched/signal/sig_dispatch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_dispatch.c + * sched/signal/sig_dispatch.c * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_findaction.c b/sched/signal/sig_findaction.c index be81496989..82a85c634f 100644 --- a/sched/signal/sig_findaction.c +++ b/sched/signal/sig_findaction.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_findaction.c + * sched/signal/sig_findaction.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_initialize.c b/sched/signal/sig_initialize.c index cd76c67951..2497962fe3 100644 --- a/sched/signal/sig_initialize.c +++ b/sched/signal/sig_initialize.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_initialize.c + * sched/signal/sig_initialize.c * * Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_kill.c b/sched/signal/sig_kill.c index e9d110b618..cceb38fe56 100644 --- a/sched/signal/sig_kill.c +++ b/sched/signal/sig_kill.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_kill.c + * sched/signal/sig_kill.c * * Copyright (C) 2007, 2009, 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_lowest.c b/sched/signal/sig_lowest.c index c84d7bfee0..a556f45b78 100644 --- a/sched/signal/sig_lowest.c +++ b/sched/signal/sig_lowest.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_lowest.c + * sched/signal/sig_lowest.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_mqnotempty.c b/sched/signal/sig_mqnotempty.c index 3e7412ecdd..bee8270d60 100644 --- a/sched/signal/sig_mqnotempty.c +++ b/sched/signal/sig_mqnotempty.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_mqnotempty.c + * sched/signal/sig_mqnotempty.c * * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_pending.c b/sched/signal/sig_pending.c index 9169604757..5dadaca68a 100644 --- a/sched/signal/sig_pending.c +++ b/sched/signal/sig_pending.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_pending.c + * sched/signal/sig_pending.c * * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_procmask.c b/sched/signal/sig_procmask.c index eb065af3ac..6a74c6fa7e 100644 --- a/sched/signal/sig_procmask.c +++ b/sched/signal/sig_procmask.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_procmask.c + * sched/signal/sig_procmask.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_queue.c b/sched/signal/sig_queue.c index 5156622503..2933e7140e 100644 --- a/sched/signal/sig_queue.c +++ b/sched/signal/sig_queue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_queue.c + * sched/signal/sig_queue.c * * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_releasependingsigaction.c b/sched/signal/sig_releasependingsigaction.c index e5fbf8a7ae..33b0714bd9 100644 --- a/sched/signal/sig_releasependingsigaction.c +++ b/sched/signal/sig_releasependingsigaction.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_releasependingsigaction.c + * sched/signal/sig_releasependingsigaction.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_releasependingsignal.c b/sched/signal/sig_releasependingsignal.c index 392b825b33..90281e8bf2 100644 --- a/sched/signal/sig_releasependingsignal.c +++ b/sched/signal/sig_releasependingsignal.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_releasependingsignal.c + * sched/signal/sig_releasependingsignal.c * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_removependingsignal.c b/sched/signal/sig_removependingsignal.c index 723ab3b743..0b4bebbb54 100644 --- a/sched/signal/sig_removependingsignal.c +++ b/sched/signal/sig_removependingsignal.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_removependingsignal.c + * sched/signal/sig_removependingsignal.c * * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_suspend.c b/sched/signal/sig_suspend.c index d434761c8f..809f43b0b7 100644 --- a/sched/signal/sig_suspend.c +++ b/sched/signal/sig_suspend.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_suspend.c + * sched/signal/sig_suspend.c * * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_timedwait.c b/sched/signal/sig_timedwait.c index 0e4635ad6c..e01f358074 100644 --- a/sched/signal/sig_timedwait.c +++ b/sched/signal/sig_timedwait.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_timedwait.c + * sched/signal/sig_timedwait.c * * Copyright (C) 2007-2009, 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_unmaskpendingsignal.c b/sched/signal/sig_unmaskpendingsignal.c index 8d13b7a0fe..9fe76762d7 100644 --- a/sched/signal/sig_unmaskpendingsignal.c +++ b/sched/signal/sig_unmaskpendingsignal.c @@ -1,5 +1,5 @@ /************************************************************************ - * sched/sig_unmaskpendingsignal.c + * sched/signal/sig_unmaskpendingsignal.c * * Copyright (C) 2007, 2009, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/signal/sig_waitinfo.c b/sched/signal/sig_waitinfo.c index 0172ec47d9..0ea81c5787 100644 --- a/sched/signal/sig_waitinfo.c +++ b/sched/signal/sig_waitinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * sched/sig_waitinfo.c + * sched/signal/sig_waitinfo.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/sched/task_setup.c b/sched/task_setup.c index 3e798f4076..28d5ecdd81 100644 --- a/sched/task_setup.c +++ b/sched/task_setup.c @@ -49,7 +49,7 @@ #include #include "os_internal.h" -#include "pthread_internal.h" +#include "pthread/pthread.h" #include "group_internal.h" /****************************************************************************