summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/sched/Makefile7
-rw-r--r--nuttx/sched/group_leave.c2
-rw-r--r--nuttx/sched/group_signal.c2
-rw-r--r--nuttx/sched/mqueue/Make.defs2
-rw-r--r--nuttx/sched/mqueue/mq_descreate.c2
-rw-r--r--nuttx/sched/mqueue/mq_sndinternal.c2
-rw-r--r--nuttx/sched/os_start.c2
-rw-r--r--nuttx/sched/pthread_condtimedwait.c2
-rw-r--r--nuttx/sched/signal/sig_action.c (renamed from nuttx/sched/sig_action.c)2
-rw-r--r--nuttx/sched/signal/sig_allocatependingsigaction.c (renamed from nuttx/sched/sig_allocatependingsigaction.c)2
-rw-r--r--nuttx/sched/signal/sig_cleanup.c (renamed from nuttx/sched/sig_cleanup.c)2
-rw-r--r--nuttx/sched/signal/sig_deliver.c (renamed from nuttx/sched/sig_deliver.c)2
-rw-r--r--nuttx/sched/signal/sig_dispatch.c (renamed from nuttx/sched/sig_dispatch.c)2
-rw-r--r--nuttx/sched/signal/sig_findaction.c (renamed from nuttx/sched/sig_findaction.c)2
-rw-r--r--nuttx/sched/signal/sig_initialize.c (renamed from nuttx/sched/sig_initialize.c)2
-rw-r--r--nuttx/sched/signal/sig_kill.c (renamed from nuttx/sched/sig_kill.c)2
-rw-r--r--nuttx/sched/signal/sig_lowest.c (renamed from nuttx/sched/sig_lowest.c)2
-rw-r--r--nuttx/sched/signal/sig_mqnotempty.c (renamed from nuttx/sched/sig_mqnotempty.c)2
-rw-r--r--nuttx/sched/signal/sig_pause.c (renamed from nuttx/sched/pause.c)0
-rw-r--r--nuttx/sched/signal/sig_pending.c (renamed from nuttx/sched/sig_pending.c)2
-rw-r--r--nuttx/sched/signal/sig_procmask.c (renamed from nuttx/sched/sig_procmask.c)2
-rw-r--r--nuttx/sched/signal/sig_queue.c (renamed from nuttx/sched/sig_queue.c)2
-rw-r--r--nuttx/sched/signal/sig_releasependingsigaction.c (renamed from nuttx/sched/sig_releasependingsigaction.c)2
-rw-r--r--nuttx/sched/signal/sig_releasependingsignal.c (renamed from nuttx/sched/sig_releasependingsignal.c)2
-rw-r--r--nuttx/sched/signal/sig_removependingsignal.c (renamed from nuttx/sched/sig_removependingsignal.c)2
-rw-r--r--nuttx/sched/signal/sig_suspend.c (renamed from nuttx/sched/sig_suspend.c)2
-rw-r--r--nuttx/sched/signal/sig_timedwait.c (renamed from nuttx/sched/sig_timedwait.c)2
-rw-r--r--nuttx/sched/signal/sig_unmaskpendingsignal.c (renamed from nuttx/sched/sig_unmaskpendingsignal.c)2
-rw-r--r--nuttx/sched/signal/sig_waitinfo.c (renamed from nuttx/sched/sig_waitinfo.c)0
-rw-r--r--nuttx/sched/signal/signal.h (renamed from nuttx/sched/sig_internal.h)10
-rw-r--r--nuttx/sched/task_exit.c2
-rw-r--r--nuttx/sched/task_exithook.c2
-rw-r--r--nuttx/sched/task_restart.c2
-rw-r--r--nuttx/sched/task_terminate.c2
-rw-r--r--nuttx/sched/timer_settime.c2
35 files changed, 38 insertions, 41 deletions
diff --git a/nuttx/sched/Makefile b/nuttx/sched/Makefile
index cfaf96f16..3030f3ab5 100644
--- a/nuttx/sched/Makefile
+++ b/nuttx/sched/Makefile
@@ -183,20 +183,17 @@ endif
IRQ_SRCS = irq_initialize.c irq_attach.c irq_dispatch.c irq_unexpectedisr.c
+include signal/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)
+CSRCS += $(IRQ_SRCS) $(CLOCK_SRCS) $(MQUEUE_SRCS) $(SIGNAL_SRCS)
ifneq ($(CONFIG_DISABLE_PTHREAD),y)
CSRCS += $(PTHREAD_SRCS)
endif
-ifneq ($(CONFIG_DISABLE_SIGNALS),y)
-CSRCS += $(SIGNAL_SRCS)
-endif
-
ifneq ($(CONFIG_DISABLE_ENVIRON),y)
CSRCS += $(ENV_SRCS)
endif
diff --git a/nuttx/sched/group_leave.c b/nuttx/sched/group_leave.c
index 9f672573c..71eded8b1 100644
--- a/nuttx/sched/group_leave.c
+++ b/nuttx/sched/group_leave.c
@@ -49,7 +49,7 @@
#include <nuttx/lib.h>
#include "env_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
#include "pthread_internal.h"
#include "mqueue/mqueue.h"
#include "group_internal.h"
diff --git a/nuttx/sched/group_signal.c b/nuttx/sched/group_signal.c
index e46b190fd..c158bc89e 100644
--- a/nuttx/sched/group_signal.c
+++ b/nuttx/sched/group_signal.c
@@ -47,7 +47,7 @@
#include "os_internal.h"
#include "group_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
#if defined(HAVE_TASK_GROUP) && !defined(CONFIG_DISABLE_SIGNALS)
diff --git a/nuttx/sched/mqueue/Make.defs b/nuttx/sched/mqueue/Make.defs
index 55952862c..1dc67e356 100644
--- a/nuttx/sched/mqueue/Make.defs
+++ b/nuttx/sched/mqueue/Make.defs
@@ -44,7 +44,7 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
MQUEUE_SRCS += mq_waitirq.c mq_notify.c
endif
-# Include mq build support
+# Include mqueue build support
DEPPATH += --dep-path mqueue
VPATH += :mqueue
diff --git a/nuttx/sched/mqueue/mq_descreate.c b/nuttx/sched/mqueue/mq_descreate.c
index 7043bf055..b22714791 100644
--- a/nuttx/sched/mqueue/mq_descreate.c
+++ b/nuttx/sched/mqueue/mq_descreate.c
@@ -52,7 +52,7 @@
#include <nuttx/kmalloc.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
#include "mqueue/mqueue.h"
diff --git a/nuttx/sched/mqueue/mq_sndinternal.c b/nuttx/sched/mqueue/mq_sndinternal.c
index 08764f0d8..270f5ab7a 100644
--- a/nuttx/sched/mqueue/mq_sndinternal.c
+++ b/nuttx/sched/mqueue/mq_sndinternal.c
@@ -53,7 +53,7 @@
#include "os_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
-# include "sig_internal.h"
+# include "signal/signal.h"
#endif
#include "mqueue/mqueue.h"
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c
index c930e4bb5..9963cc3a1 100644
--- a/nuttx/sched/os_start.c
+++ b/nuttx/sched/os_start.c
@@ -52,7 +52,7 @@
#include <nuttx/init.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
#include "wd_internal.h"
#include "sem_internal.h"
#ifndef CONFIG_DISABLE_MQUEUE
diff --git a/nuttx/sched/pthread_condtimedwait.c b/nuttx/sched/pthread_condtimedwait.c
index 37534dacf..0a53918b8 100644
--- a/nuttx/sched/pthread_condtimedwait.c
+++ b/nuttx/sched/pthread_condtimedwait.c
@@ -53,7 +53,7 @@
#include "os_internal.h"
#include "pthread_internal.h"
#include "clock_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_action.c b/nuttx/sched/signal/sig_action.c
index 049a85823..bd17e4f9f 100644
--- a/nuttx/sched/sig_action.c
+++ b/nuttx/sched/signal/sig_action.c
@@ -47,7 +47,7 @@
#include "os_internal.h"
#include "group_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_allocatependingsigaction.c b/nuttx/sched/signal/sig_allocatependingsigaction.c
index 15d6470ca..fa8236ee8 100644
--- a/nuttx/sched/sig_allocatependingsigaction.c
+++ b/nuttx/sched/signal/sig_allocatependingsigaction.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_cleanup.c b/nuttx/sched/signal/sig_cleanup.c
index 46b3cb584..535c6273a 100644
--- a/nuttx/sched/sig_cleanup.c
+++ b/nuttx/sched/signal/sig_cleanup.c
@@ -41,7 +41,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_deliver.c b/nuttx/sched/signal/sig_deliver.c
index d3a7afc17..6e40db179 100644
--- a/nuttx/sched/sig_deliver.c
+++ b/nuttx/sched/signal/sig_deliver.c
@@ -49,7 +49,7 @@
#include "os_internal.h"
#include "sem_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_dispatch.c b/nuttx/sched/signal/sig_dispatch.c
index f98577885..6cada00af 100644
--- a/nuttx/sched/sig_dispatch.c
+++ b/nuttx/sched/signal/sig_dispatch.c
@@ -51,7 +51,7 @@
#include "os_internal.h"
#include "group_internal.h"
#include "sem_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
#include "mqueue/mqueue.h"
/****************************************************************************
diff --git a/nuttx/sched/sig_findaction.c b/nuttx/sched/signal/sig_findaction.c
index b701d3232..be8149698 100644
--- a/nuttx/sched/sig_findaction.c
+++ b/nuttx/sched/signal/sig_findaction.c
@@ -38,7 +38,7 @@
************************************************************************/
#include <nuttx/config.h>
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_initialize.c b/nuttx/sched/signal/sig_initialize.c
index 966d818a1..cd76c6795 100644
--- a/nuttx/sched/sig_initialize.c
+++ b/nuttx/sched/signal/sig_initialize.c
@@ -44,7 +44,7 @@
#include <nuttx/kmalloc.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_kill.c b/nuttx/sched/signal/sig_kill.c
index 90ac918f3..e9d110b61 100644
--- a/nuttx/sched/sig_kill.c
+++ b/nuttx/sched/signal/sig_kill.c
@@ -45,7 +45,7 @@
#include <debug.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Global Functions
diff --git a/nuttx/sched/sig_lowest.c b/nuttx/sched/signal/sig_lowest.c
index f5654eb47..c84d7bfee 100644
--- a/nuttx/sched/sig_lowest.c
+++ b/nuttx/sched/signal/sig_lowest.c
@@ -41,7 +41,7 @@
#include <signal.h>
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_mqnotempty.c b/nuttx/sched/signal/sig_mqnotempty.c
index 9bdfa9f14..3e7412ecd 100644
--- a/nuttx/sched/sig_mqnotempty.c
+++ b/nuttx/sched/signal/sig_mqnotempty.c
@@ -46,7 +46,7 @@
#include <debug.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/pause.c b/nuttx/sched/signal/sig_pause.c
index f75afa6c9..f75afa6c9 100644
--- a/nuttx/sched/pause.c
+++ b/nuttx/sched/signal/sig_pause.c
diff --git a/nuttx/sched/sig_pending.c b/nuttx/sched/signal/sig_pending.c
index 98d784767..916960475 100644
--- a/nuttx/sched/sig_pending.c
+++ b/nuttx/sched/signal/sig_pending.c
@@ -43,7 +43,7 @@
#include <sched.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_procmask.c b/nuttx/sched/signal/sig_procmask.c
index aa738aa9a..eb065af3a 100644
--- a/nuttx/sched/sig_procmask.c
+++ b/nuttx/sched/signal/sig_procmask.c
@@ -50,7 +50,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_queue.c b/nuttx/sched/signal/sig_queue.c
index 8174fe1fa..515662250 100644
--- a/nuttx/sched/sig_queue.c
+++ b/nuttx/sched/signal/sig_queue.c
@@ -46,7 +46,7 @@
#include <errno.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_releasependingsigaction.c b/nuttx/sched/signal/sig_releasependingsigaction.c
index b0dab2ea9..e5fbf8a7a 100644
--- a/nuttx/sched/sig_releasependingsigaction.c
+++ b/nuttx/sched/signal/sig_releasependingsigaction.c
@@ -42,7 +42,7 @@
#include <sched.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_releasependingsignal.c b/nuttx/sched/signal/sig_releasependingsignal.c
index 41c2286eb..392b825b3 100644
--- a/nuttx/sched/sig_releasependingsignal.c
+++ b/nuttx/sched/signal/sig_releasependingsignal.c
@@ -51,7 +51,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_removependingsignal.c b/nuttx/sched/signal/sig_removependingsignal.c
index 656cf726a..723ab3b74 100644
--- a/nuttx/sched/sig_removependingsignal.c
+++ b/nuttx/sched/signal/sig_removependingsignal.c
@@ -51,7 +51,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_suspend.c b/nuttx/sched/signal/sig_suspend.c
index 7342d124c..d434761c8 100644
--- a/nuttx/sched/sig_suspend.c
+++ b/nuttx/sched/signal/sig_suspend.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_timedwait.c b/nuttx/sched/signal/sig_timedwait.c
index 85b870642..0e4635ad6 100644
--- a/nuttx/sched/sig_timedwait.c
+++ b/nuttx/sched/signal/sig_timedwait.c
@@ -53,7 +53,7 @@
#include <nuttx/arch.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
#include "clock_internal.h"
/****************************************************************************
diff --git a/nuttx/sched/sig_unmaskpendingsignal.c b/nuttx/sched/signal/sig_unmaskpendingsignal.c
index c9326e306..8d13b7a0f 100644
--- a/nuttx/sched/sig_unmaskpendingsignal.c
+++ b/nuttx/sched/signal/sig_unmaskpendingsignal.c
@@ -42,7 +42,7 @@
#include <sched.h>
#include "os_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/************************************************************************
* Definitions
diff --git a/nuttx/sched/sig_waitinfo.c b/nuttx/sched/signal/sig_waitinfo.c
index 0172ec47d..0172ec47d 100644
--- a/nuttx/sched/sig_waitinfo.c
+++ b/nuttx/sched/signal/sig_waitinfo.c
diff --git a/nuttx/sched/sig_internal.h b/nuttx/sched/signal/signal.h
index c9f74491e..2277dea1a 100644
--- a/nuttx/sched/sig_internal.h
+++ b/nuttx/sched/signal/signal.h
@@ -1,7 +1,7 @@
/****************************************************************************
- * sched/sig_internal.h
+ * sched/signal/signal.h
*
- * Copyright (C) 2007-2009, 2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009, 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __SCHED_SIG_INTERNAL_H
-#define __SCHED_SIG_INTERNAL_H
+#ifndef __SCHED_SIGNAL_SIGNAL_H
+#define __SCHED_SIGNAL_SIGNAL_H
/****************************************************************************
* Included Files
@@ -198,4 +198,4 @@ void sig_releasependingsignal(FAR sigpendq_t *sigpend);
FAR sigpendq_t *sig_removependingsignal(FAR struct tcb_s *stcb, int signo);
void sig_unmaskpendingsignal(void);
-#endif /* __SCHED_SIG_INTERNAL_H */
+#endif /* __SCHED_SIGNAL_SIGNAL_H */
diff --git a/nuttx/sched/task_exit.c b/nuttx/sched/task_exit.c
index 9483f65fd..4bcdc189c 100644
--- a/nuttx/sched/task_exit.c
+++ b/nuttx/sched/task_exit.c
@@ -42,7 +42,7 @@
#include <sched.h>
#include "os_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
-# include "sig_internal.h"
+# include "signal/signal.h"
#endif
/****************************************************************************
diff --git a/nuttx/sched/task_exithook.c b/nuttx/sched/task_exithook.c
index e776bb155..5074a9986 100644
--- a/nuttx/sched/task_exithook.c
+++ b/nuttx/sched/task_exithook.c
@@ -50,7 +50,7 @@
#include "os_internal.h"
#include "group_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/nuttx/sched/task_restart.c b/nuttx/sched/task_restart.c
index e47c12822..45346c6f1 100644
--- a/nuttx/sched/task_restart.c
+++ b/nuttx/sched/task_restart.c
@@ -47,7 +47,7 @@
#include "os_internal.h"
#include "group_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
/****************************************************************************
* Definitions
diff --git a/nuttx/sched/task_terminate.c b/nuttx/sched/task_terminate.c
index 9d034d719..11438d22d 100644
--- a/nuttx/sched/task_terminate.c
+++ b/nuttx/sched/task_terminate.c
@@ -49,7 +49,7 @@
#include "os_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
-# include "sig_internal.h"
+# include "signal/signal.h"
#endif
/****************************************************************************
diff --git a/nuttx/sched/timer_settime.c b/nuttx/sched/timer_settime.c
index a09c81813..747a25834 100644
--- a/nuttx/sched/timer_settime.c
+++ b/nuttx/sched/timer_settime.c
@@ -46,7 +46,7 @@
#include "os_internal.h"
#include "clock_internal.h"
-#include "sig_internal.h"
+#include "signal/signal.h"
#include "timer_internal.h"
#ifndef CONFIG_DISABLE_POSIX_TIMERS
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 12:17:42 +0000