sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "toolchain/ghs: Fix CONFIG_SCHED_CRITMONITOR_MAXTIME_XXX "zero used for undefined preprocessing identifier" warnings"

Browse Source 
move private define to public

This reverts commit 236678d730.

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-09-23 08:59:15 +08:00 committed by Xiang Xiao
parent 8cd52bee2e
commit 9dbde04327
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/nuttx/sched.h
View File

@ -72,10 +72,16 @@
# define CONFIG_SCHED_SPORADIC_MAXREPL 3 # define CONFIG_SCHED_SPORADIC_MAXREPL 3
#endif #endif
/* Scheduling monitor */
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD #ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD -1 # define CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD -1
#endif #endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE -1
#endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION #ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION -1 # define CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION -1
#endif #endif
@ -84,6 +90,14 @@
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION -1 # define CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION -1
#endif #endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ -1
#endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG -1
#endif
/* Task Management Definitions **********************************************/ /* Task Management Definitions **********************************************/
/* Special task IDS. Any negative PID is invalid. */ /* Special task IDS. Any negative PID is invalid. */

24
sched/sched/sched.h
View File

@ -107,30 +107,6 @@
# define TLIST_BLOCKED(t) __TLIST_HEAD(t) # define TLIST_BLOCKED(t) __TLIST_HEAD(t)
#endif #endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD -1
#endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE -1
#endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION -1
#endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION -1
#endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ -1
#endif
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG -1
#endif
#ifdef CONFIG_SCHED_CRITMONITOR_MAXTIME_PANIC #ifdef CONFIG_SCHED_CRITMONITOR_MAXTIME_PANIC
# define CRITMONITOR_PANIC(fmt, ...) \ # define CRITMONITOR_PANIC(fmt, ...) \
do \ do \