Sfoglia il codice sorgente

[include][dbg]update: delete rtdebug.h (#7759)

Shicheng Chu 1 anno fa
parent
commit
2da019234e

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_gpio.c

@@ -8,7 +8,6 @@
  * 2022-07-15     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include <drivers/pin.h>
 #include "ch56x_gpio.h"
 #include "isr_sp.h"

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_pfic.c

@@ -8,7 +8,6 @@
  * 2022-07-15     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include "ch56x_pfic.h"
 #include "ch56x_sys.h"
 #include "isr_sp.h"

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_pwm.c

@@ -8,7 +8,6 @@
  * 2022-08-04     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include <drivers/rt_drv_pwm.h>
 #include <drivers/pin.h>
 #include "ch56x_pwm.h"

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c

@@ -8,7 +8,6 @@
  * 2022-07-30     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include <drivers/spi.h>
 #include <drivers/pin.h>
 #include "ch56x_spi.h"

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_sys.c

@@ -8,7 +8,6 @@
  * 2022-07-15     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include "ch56x_sys.h"
 
 static uint32_t hclk_freq;

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_timer.c

@@ -8,7 +8,6 @@
  * 2022-07-15     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include <drivers/hwtimer.h>
 #include "ch56x_sys.h"
 #include "ch56x_timer.h"

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_uart.c

@@ -8,7 +8,6 @@
  * 2022-07-15     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include <ipc/completion.h>
 #include <ipc/dataqueue.h>
 #ifdef RT_USING_SERIAL_V2

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_usbd.c

@@ -8,7 +8,6 @@
  * 2022-08-22     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include <drivers/usb_common.h>
 #include <drivers/usb_device.h>
 #include "ch56x_usbhs.h"

+ 0 - 1
bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_wdt.c

@@ -8,7 +8,6 @@
  * 2022-07-20     Emuzit            first version
  */
 #include <rthw.h>
-#include <rtdebug.h>
 #include <drivers/watchdog.h>
 #include "ch56x_sys.h"
 

+ 0 - 1
bsp/wch/risc-v/ch569w-evt/applications/test.c

@@ -12,7 +12,6 @@
  * 2022-08-04     Emuzit            add pwm test
  */
 #include <rtthread.h>
-#include <rtdebug.h>
 #include <drivers/pin.h>
 #include <drivers/watchdog.h>
 #include <drivers/hwtimer.h>

+ 0 - 112
include/rtdebug.h

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2006-2021, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Change Logs:
- * Date                 Author             Notes
- */
-
-#ifndef __RTDEBUG_H__
-#define __RTDEBUG_H__
-
-#include <rtconfig.h>
-
-/* Using this macro to control all kernel debug features. */
-#ifdef RT_DEBUG
-
-/* Turn on this to enable context check */
-#ifndef RT_DEBUG_CONTEXT_CHECK
-#define RT_DEBUG_CONTEXT_CHECK         1
-#endif
-
-#define RT_ASSERT(EX)                                                         \
-if (!(EX))                                                                    \
-{                                                                             \
-    rt_assert_handler(#EX, __FUNCTION__, __LINE__);                           \
-}
-
-/* Macro to check current context */
-#if RT_DEBUG_CONTEXT_CHECK
-#define RT_DEBUG_NOT_IN_INTERRUPT                                             \
-do                                                                            \
-{                                                                             \
-    rt_base_t level;                                                          \
-    level = rt_hw_interrupt_disable();                                        \
-    if (rt_interrupt_get_nest() != 0)                                         \
-    {                                                                         \
-        rt_kprintf("Function[%s] shall not be used in ISR\n", __FUNCTION__);  \
-        RT_ASSERT(0)                                                          \
-    }                                                                         \
-    rt_hw_interrupt_enable(level);                                            \
-}                                                                             \
-while (0)
-
-/* "In thread context" means:
- *     1) the scheduler has been started
- *     2) not in interrupt context.
- */
-#define RT_DEBUG_IN_THREAD_CONTEXT                                            \
-do                                                                            \
-{                                                                             \
-    rt_base_t level;                                                          \
-    level = rt_hw_interrupt_disable();                                        \
-    if (rt_thread_self() == RT_NULL)                                          \
-    {                                                                         \
-        rt_kprintf("Function[%s] shall not be used before scheduler start\n", \
-                   __FUNCTION__);                                             \
-        RT_ASSERT(0)                                                          \
-    }                                                                         \
-    RT_DEBUG_NOT_IN_INTERRUPT;                                                \
-    rt_hw_interrupt_enable(level);                                            \
-}                                                                             \
-while (0)
-
-/* "scheduler available" means:
- *     1) the scheduler has been started.
- *     2) not in interrupt context.
- *     3) scheduler is not locked.
- *     4) interrupt is not disabled.
- */
-#define RT_DEBUG_SCHEDULER_AVAILABLE(need_check)                              \
-do                                                                            \
-{                                                                             \
-    if (need_check)                                                           \
-    {                                                                         \
-        rt_bool_t interrupt_disabled;                                         \
-        rt_base_t level;                                                      \
-        interrupt_disabled = rt_hw_interrupt_is_disabled();                   \
-        level = rt_hw_interrupt_disable();                                    \
-        if (rt_critical_level() != 0)                                         \
-        {                                                                     \
-            rt_kprintf("Function[%s]: scheduler is not available\n",          \
-                    __FUNCTION__);                                            \
-            RT_ASSERT(0)                                                      \
-        }                                                                     \
-        if (interrupt_disabled == RT_TRUE)                                    \
-        {                                                                     \
-            rt_kprintf("Function[%s]: interrupt is disabled\n",               \
-                    __FUNCTION__);                                            \
-            RT_ASSERT(0)                                                      \
-        }                                                                     \
-        RT_DEBUG_IN_THREAD_CONTEXT;                                           \
-        rt_hw_interrupt_enable(level);                                        \
-    }                                                                         \
-}                                                                             \
-while (0)
-#else
-#define RT_DEBUG_NOT_IN_INTERRUPT
-#define RT_DEBUG_IN_THREAD_CONTEXT
-#define RT_DEBUG_SCHEDULER_AVAILABLE(need_check)
-#endif
-
-#else /* RT_DEBUG */
-
-#define RT_ASSERT(EX)
-#define RT_DEBUG_NOT_IN_INTERRUPT
-#define RT_DEBUG_IN_THREAD_CONTEXT
-#define RT_DEBUG_SCHEDULER_AVAILABLE(need_check)
-
-#endif /* RT_DEBUG */
-
-#endif /* __RTDEBUG_H__ */

+ 93 - 2
include/rtthread.h

@@ -18,13 +18,13 @@
  * 2021-11-14     Meco Man     add rtlegacy.h for compatibility
  * 2022-06-04     Meco Man     remove strnlen
  * 2023-05-20     Bernard      add rtatomic.h header file to included files.
+ * 2023-06-30     ChuShicheng  Move RT_DEBUG_CONTEXT_CHECK from the rtdebug.h
  */
 
 #ifndef __RT_THREAD_H__
 #define __RT_THREAD_H__
 
 #include <rtconfig.h>
-#include <rtdebug.h>
 #include <rtdef.h>
 #include <rtservice.h>
 #include <rtm.h>
@@ -728,8 +728,99 @@ void rt_show_version(void);
 #ifdef RT_DEBUG
 extern void (*rt_assert_hook)(const char *ex, const char *func, rt_size_t line);
 void rt_assert_set_hook(void (*hook)(const char *ex, const char *func, rt_size_t line));
-
 void rt_assert_handler(const char *ex, const char *func, rt_size_t line);
+
+/* Turn on this to enable context check */
+#ifndef RT_DEBUG_CONTEXT_CHECK
+#define RT_DEBUG_CONTEXT_CHECK         1
+#endif
+
+#define RT_ASSERT(EX)                                                         \
+if (!(EX))                                                                    \
+{                                                                             \
+    rt_assert_handler(#EX, __FUNCTION__, __LINE__);                           \
+}
+
+/* Macro to check current context */
+#if RT_DEBUG_CONTEXT_CHECK
+#define RT_DEBUG_NOT_IN_INTERRUPT                                             \
+do                                                                            \
+{                                                                             \
+    rt_base_t level;                                                          \
+    level = rt_hw_interrupt_disable();                                        \
+    if (rt_interrupt_get_nest() != 0)                                         \
+    {                                                                         \
+        rt_kprintf("Function[%s] shall not be used in ISR\n", __FUNCTION__);  \
+        RT_ASSERT(0)                                                          \
+    }                                                                         \
+    rt_hw_interrupt_enable(level);                                            \
+}                                                                             \
+while (0)
+
+/* "In thread context" means:
+ *     1) the scheduler has been started
+ *     2) not in interrupt context.
+ */
+#define RT_DEBUG_IN_THREAD_CONTEXT                                            \
+do                                                                            \
+{                                                                             \
+    rt_base_t level;                                                          \
+    level = rt_hw_interrupt_disable();                                        \
+    if (rt_thread_self() == RT_NULL)                                          \
+    {                                                                         \
+        rt_kprintf("Function[%s] shall not be used before scheduler start\n", \
+                   __FUNCTION__);                                             \
+        RT_ASSERT(0)                                                          \
+    }                                                                         \
+    RT_DEBUG_NOT_IN_INTERRUPT;                                                \
+    rt_hw_interrupt_enable(level);                                            \
+}                                                                             \
+while (0)
+
+/* "scheduler available" means:
+ *     1) the scheduler has been started.
+ *     2) not in interrupt context.
+ *     3) scheduler is not locked.
+ *     4) interrupt is not disabled.
+ */
+#define RT_DEBUG_SCHEDULER_AVAILABLE(need_check)                              \
+do                                                                            \
+{                                                                             \
+    if (need_check)                                                           \
+    {                                                                         \
+        rt_bool_t interrupt_disabled;                                         \
+        rt_base_t level;                                                      \
+        interrupt_disabled = rt_hw_interrupt_is_disabled();                   \
+        level = rt_hw_interrupt_disable();                                    \
+        if (rt_critical_level() != 0)                                         \
+        {                                                                     \
+            rt_kprintf("Function[%s]: scheduler is not available\n",          \
+                    __FUNCTION__);                                            \
+            RT_ASSERT(0)                                                      \
+        }                                                                     \
+        if (interrupt_disabled == RT_TRUE)                                    \
+        {                                                                     \
+            rt_kprintf("Function[%s]: interrupt is disabled\n",               \
+                    __FUNCTION__);                                            \
+            RT_ASSERT(0)                                                      \
+        }                                                                     \
+        RT_DEBUG_IN_THREAD_CONTEXT;                                           \
+        rt_hw_interrupt_enable(level);                                        \
+    }                                                                         \
+}                                                                             \
+while (0)
+#else
+#define RT_DEBUG_NOT_IN_INTERRUPT
+#define RT_DEBUG_IN_THREAD_CONTEXT
+#define RT_DEBUG_SCHEDULER_AVAILABLE(need_check)
+#endif
+
+#else /* RT_DEBUG */
+
+#define RT_ASSERT(EX)
+#define RT_DEBUG_NOT_IN_INTERRUPT
+#define RT_DEBUG_IN_THREAD_CONTEXT
+#define RT_DEBUG_SCHEDULER_AVAILABLE(need_check)
 #endif /* RT_DEBUG */
 
 #ifdef RT_USING_FINSH