Revert "toolchain/ghs: Fix CONFIG_SCHED_CRITMONITOR_MAXTIME_XXX "zero…

… used for undefined preprocessing identifier" warnings" move private define to public This reverts commit 236678d. Signed-off-by: chao an <[email protected]>
apache · Sep 24, 2024 · 8288fe4 · 8288fe4
1 parent a5b85fc
commit 8288fe4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
@@ -72,10 +72,16 @@
 #  define CONFIG_SCHED_SPORADIC_MAXREPL 3
 #endif
 
+/* Scheduling monitor */
+
 #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
@@ -84,6 +90,14 @@
 #  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
+
 /* Task Management Definitions **********************************************/
 
 /* Special task IDS.  Any negative PID is invalid. */

diff --git a/sched/sched/sched.h b/sched/sched/sched.h
@@ -107,30 +107,6 @@
 #  define TLIST_BLOCKED(t)       __TLIST_HEAD(t)
 #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
 #  define CRITMONITOR_PANIC(fmt, ...) \
           do \