Merge pull request #2568 from armink/fix_rtdbg

Fix rtdbg

26 files changed, 79 insertions, 76 deletions

diff --git a/components/dfs/include/dfs_private.h b/components/dfs/include/dfs_private.h
index 77dbe8562d..fccd260ac0 100644
--- a/components/dfs/include/dfs_private.h
+++ b/components/dfs/include/dfs_private.h
@@ -12,8 +12,8 @@
 
 #include <dfs.h>
 
-#define DBG_SECTION_NAME    "DFS"
-#define DBG_LEVEL           DBG_INFO
+#define DBG_TAG    "DFS"
+#define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
 
 #define NO_WORKING_DIR  "system does not support working directory\n"
diff --git a/components/drivers/misc/adc.c b/components/drivers/misc/adc.c
index fec4f736e0..2d26beb243 100644
--- a/components/drivers/misc/adc.c
+++ b/components/drivers/misc/adc.c
@@ -15,8 +15,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define DBG_SECTION_NAME "adc"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "adc"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 static rt_size_t _adc_read(rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
diff --git a/components/drivers/sdio/block_dev.c b/components/drivers/sdio/block_dev.c
index dcfbc0ca7b..cac4fc5036 100644
--- a/components/drivers/sdio/block_dev.c
+++ b/components/drivers/sdio/block_dev.c
@@ -13,11 +13,11 @@
 
 #include <drivers/mmcsd_core.h>
 
-#define DBG_SECTION_NAME               "SDIO"
+#define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_LVL               DBG_INFO
 #endif /* RT_SDIO_DEBUG */
 #include <rtdbg.h>
 
diff --git a/components/drivers/sdio/mmc.c b/components/drivers/sdio/mmc.c
index 5f9259ef52..5c7ddcb258 100644
--- a/components/drivers/sdio/mmc.c
+++ b/components/drivers/sdio/mmc.c
@@ -11,11 +11,11 @@
 #include <drivers/mmcsd_core.h>
 #include <drivers/mmc.h>
 
-#define DBG_SECTION_NAME               "SDIO"
+#define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_LVL               DBG_INFO
 #endif /* RT_SDIO_DEBUG */
 #include <rtdbg.h>
 
diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/mmcsd_core.c
index 160defa645..8131a33133 100644
--- a/components/drivers/sdio/mmcsd_core.c
+++ b/components/drivers/sdio/mmcsd_core.c
@@ -14,11 +14,11 @@
 #include <drivers/mmc.h>
 #include <drivers/sdio.h>
 
-#define DBG_SECTION_NAME               "SDIO"
+#define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_LVL               DBG_INFO
 #endif /* RT_SDIO_DEBUG */
 #include <rtdbg.h>
 
diff --git a/components/drivers/sdio/sd.c b/components/drivers/sdio/sd.c
index f4e925507c..3e7ad1cd16 100644
--- a/components/drivers/sdio/sd.c
+++ b/components/drivers/sdio/sd.c
@@ -11,11 +11,11 @@
 #include <drivers/mmcsd_core.h>
 #include <drivers/sd.h>
 
-#define DBG_SECTION_NAME               "SDIO"
+#define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_LVL               DBG_INFO
 #endif /* RT_SDIO_DEBUG */
 #include <rtdbg.h>
 
diff --git a/components/drivers/sdio/sdio.c b/components/drivers/sdio/sdio.c
index b0516704fd..f31f5b81a8 100644
--- a/components/drivers/sdio/sdio.c
+++ b/components/drivers/sdio/sdio.c
@@ -12,11 +12,11 @@
 #include <drivers/sdio.h>
 #include <drivers/sd.h>
 
-#define DBG_SECTION_NAME               "SDIO"
+#define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_LVL               DBG_INFO
 #endif /* RT_SDIO_DEBUG */
 #include <rtdbg.h>
 
diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c
index ec1ad98fb6..c86f96c14d 100644
--- a/components/drivers/sensors/sensor.c
+++ b/components/drivers/sensors/sensor.c
@@ -10,8 +10,8 @@
 
 #include "sensor.h"
 
-#define DBG_LEVEL DBG_INFO
-#define DBG_SECTION_NAME  "sensor"
+#define DBG_TAG  "sensor"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 #include <string.h>
diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c
index 4658a42722..3369ee376a 100644
--- a/components/drivers/sensors/sensor_cmd.c
+++ b/components/drivers/sensors/sensor_cmd.c
@@ -10,8 +10,8 @@
 
 #include "sensor.h"
 
-#define DBG_LEVEL DBG_INFO
-#define DBG_SECTION_NAME  "sensor.cmd"
+#define DBG_TAG  "sensor.cmd"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 #include <stdlib.h>
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c
index 13bf54e721..d4cf35414c 100644
--- a/components/drivers/serial/serial.c
+++ b/components/drivers/serial/serial.c
@@ -28,8 +28,8 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 
-#define DBG_LEVEL           DBG_INFO
-#define DBG_SECTION_NAME    "UART"
+#define DBG_TAG    "UART"
+#define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
 
 #ifdef RT_USING_POSIX
diff --git a/components/drivers/wlan/wlan_cfg.c b/components/drivers/wlan/wlan_cfg.c
index 00e9dbc83e..43fed8e6e8 100644
--- a/components/drivers/wlan/wlan_cfg.c
+++ b/components/drivers/wlan/wlan_cfg.c
@@ -11,12 +11,12 @@
 #include <rtthread.h>
 #include <wlan_cfg.h>
 
+#define DBG_TAG "WLAN.cfg"
 #ifdef RT_WLAN_CFG_DEBUG
-#define DBG_LEVEL DBG_LOG
+#define DBG_LVL DBG_LOG
 #else
-#define DBG_LEVEL DBG_INFO
-#endif
-#define DBG_SECTION_NAME  "WLAN.cfg"
+#define DBG_LVL DBG_INFO
+#endif /* RT_WLAN_CFG_DEBUG */
 #include <rtdbg.h>
 
 #define WLAN_CFG_LOCK()      (rt_mutex_take(&cfg_mutex, RT_WAITING_FOREVER))
diff --git a/components/drivers/wlan/wlan_dev.c b/components/drivers/wlan/wlan_dev.c
index 3f4adf35ad..82fa4e73e7 100644
--- a/components/drivers/wlan/wlan_dev.c
+++ b/components/drivers/wlan/wlan_dev.c
@@ -13,12 +13,12 @@
 #include <wlan_dev.h>
 #include <wlan_prot.h>
 
+#define DBG_TAG "WLAN.dev"
 #ifdef RT_WLAN_DEV_DEBUG
-#define DBG_LEVEL DBG_LOG
+#define DBG_LVL DBG_LOG
 #else
-#define DBG_LEVEL DBG_INFO
-#endif
-#define DBG_SECTION_NAME  "WLAN.dev"
+#define DBG_LVL DBG_INFO
+#endif /* RT_WLAN_DEV_DEBUG */
 #include <rtdbg.h>
 
 #ifndef RT_DEVICE
diff --git a/components/drivers/wlan/wlan_lwip.c b/components/drivers/wlan/wlan_lwip.c
index 052c2afd2e..84b448c68f 100644
--- a/components/drivers/wlan/wlan_lwip.c
+++ b/components/drivers/wlan/wlan_lwip.c
@@ -21,12 +21,12 @@
 #include <dhcp_server.h>
 #endif
 
+#define DBG_TAG "WLAN.lwip"
 #ifdef RT_WLAN_LWIP_DEBUG
-#define DBG_LEVEL DBG_LOG
+#define DBG_LVL DBG_LOG
 #else
-#define DBG_LEVEL DBG_INFO
-#endif
-#define DBG_SECTION_NAME  "WLAN.lwip"
+#define DBG_LVL DBG_INFO
+#endif /* RT_WLAN_LWIP_DEBUG */
 #include <rtdbg.h>
 
 #ifndef IPADDR_STRLEN_MAX
diff --git a/components/drivers/wlan/wlan_mgnt.c b/components/drivers/wlan/wlan_mgnt.c
index ced5bfa1c2..91a77e43d0 100644
--- a/components/drivers/wlan/wlan_mgnt.c
+++ b/components/drivers/wlan/wlan_mgnt.c
@@ -16,13 +16,12 @@
 #include <wlan_prot.h>
 #include <wlan_workqueue.h>
 
-
+#define DBG_TAG "WLAN.mgnt"
 #ifdef RT_WLAN_MGNT_DEBUG
-#define DBG_LEVEL DBG_LOG
+#define DBG_LVL DBG_LOG
 #else
-#define DBG_LEVEL DBG_INFO
-#endif
-#define DBG_SECTION_NAME  "WLAN.mgnt"
+#define DBG_LVL DBG_INFO
+#endif /* RT_WLAN_MGNT_DEBUG */
 #include <rtdbg.h>
 
 #ifndef RT_WLAN_DEVICE
diff --git a/components/drivers/wlan/wlan_prot.c b/components/drivers/wlan/wlan_prot.c
index 48adbc48f3..0402962e01 100644
--- a/components/drivers/wlan/wlan_prot.c
+++ b/components/drivers/wlan/wlan_prot.c
@@ -13,12 +13,12 @@
 #include <wlan_dev.h>
 #include <wlan_prot.h>
 
+#define DBG_TAG "WLAN.prot"
 #ifdef RT_WLAN_PROT_DEBUG
-#define DBG_LEVEL DBG_LOG
+#define DBG_LVL DBG_LOG
 #else
-#define DBG_LEVEL DBG_INFO
-#endif
-#define DBG_SECTION_NAME  "WLAN.prot"
+#define DBG_LVL DBG_INFO
+#endif /* RT_WLAN_PROT_DEBUG */
 #include <rtdbg.h>
 
 #if RT_WLAN_PROT_NAME_LEN < 4
diff --git a/components/drivers/wlan/wlan_workqueue.c b/components/drivers/wlan/wlan_workqueue.c
index 23823afae0..ec21243d60 100644
--- a/components/drivers/wlan/wlan_workqueue.c
+++ b/components/drivers/wlan/wlan_workqueue.c
@@ -13,8 +13,8 @@
 #include <wlan_workqueue.h>
 #include <ipc/workqueue.h>
 
-#define DBG_LEVEL DBG_INFO
-#define DBG_SECTION_NAME  "WLAN.work"
+#define DBG_TAG "WLAN.work"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 struct rt_wlan_work
diff --git a/components/libc/libdl/dlelf.c b/components/libc/libdl/dlelf.c
index 4557ee3458..1265ffcb07 100644
--- a/components/libc/libdl/dlelf.c
+++ b/components/libc/libdl/dlelf.c
@@ -11,8 +11,8 @@
 #include "dlmodule.h"
 #include "dlelf.h"
 
-#define DBG_SECTION_NAME    "DLMD"
-#define DBG_LEVEL           DBG_INFO
+#define DBG_TAG    "DLMD"
+#define DBG_LVL    DBG_INFO
 #include <rtdbg.h>          // must after of DEBUG_ENABLE or some other options
 
 rt_err_t dlmodule_load_shared_object(struct rt_dlmodule* module, void *module_ptr)
diff --git a/components/libc/libdl/dlmodule.c b/components/libc/libdl/dlmodule.c
index 14cbfe4cfb..dbebfc8961 100644
--- a/components/libc/libdl/dlmodule.c
+++ b/components/libc/libdl/dlmodule.c
@@ -16,8 +16,8 @@
 
 #include <dfs_posix.h>
 
-#define DBG_SECTION_NAME    "DLMD"
-#define DBG_LEVEL           DBG_INFO
+#define DBG_TAG    "DLMD"
+#define DBG_LVL    DBG_INFO
 #include <rtdbg.h>          // must after of DEBUG_ENABLE or some other options
 
 static struct rt_module_symtab *_rt_module_symtab_begin = RT_NULL;
diff --git a/components/lwp/lwp.c b/components/lwp/lwp.c
index e1ba26f21c..7881fcc68f 100644
--- a/components/lwp/lwp.c
+++ b/components/lwp/lwp.c
@@ -19,8 +19,8 @@
 
 #include "lwp.h"
 
-#define DBG_SECTION_NAME    "LWP"
-#define DBG_LEVEL           DBG_WARNING
+#define DBG_TAG    "LWP"
+#define DBG_LVL    DBG_WARNING
 #include <rtdbg.h>
 
 extern void lwp_user_entry(void *args, const void *text, void *data);
diff --git a/components/lwp/lwp_mem.c b/components/lwp/lwp_mem.c
index e733166934..63fd5c89e1 100644
--- a/components/lwp/lwp_mem.c
+++ b/components/lwp/lwp_mem.c
@@ -11,8 +11,8 @@
 #include <rtthread.h>
 #include <lwp.h>
 
-#define DBG_SECTION_NAME    "LWPMEM"
-#define DBG_LEVEL           DBG_WARNING
+#define DBG_TAG    "LWPMEM"
+#define DBG_LVL    DBG_WARNING
 #include <rtdbg.h>
 
 // todo: remove repleat code
diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c
index 723786f1cd..be95c5fb89 100644
--- a/components/lwp/lwp_syscall.c
+++ b/components/lwp/lwp_syscall.c
@@ -24,8 +24,8 @@
 #define SYSCALL_NET(f) ((void*)sys_notimpl)
 #endif
 
-#define DBG_SECTION_NAME    "LWP_CALL"
-#define DBG_LEVEL           DBG_WARNING
+#define DBG_TAG    "LWP_CALL"
+#define DBG_LVL           DBG_WARNING
 #include <rtdbg.h>
 
 static void __exit_files(rt_thread_t tid)
diff --git a/components/net/at/include/at_log.h b/components/net/at/include/at_log.h
index fe8766ba95..9e133561f7 100644
--- a/components/net/at/include/at_log.h
+++ b/components/net/at/include/at_log.h
@@ -13,15 +13,15 @@
  */
 
 #ifndef LOG_TAG
-#define DBG_SECTION_NAME               "at"
+#define DBG_TAG               "at"
 #else
-#define DBG_SECTION_NAME               LOG_TAG
+#define DBG_TAG               LOG_TAG
 #endif /* LOG_TAG */
 
 #ifdef AT_DEBUG
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_LVL               DBG_INFO
 #endif /* AT_DEBUG */
 
 #include <rtdbg.h>
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index 771a56f061..8d699b63e7 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -19,8 +19,8 @@
 #endif
 #include <sal.h>
 
-#define DBG_SECTION_NAME               "SAL_SKT"
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_TAG              "SAL_SKT"
+#define DBG_LVL              DBG_INFO
 #include <rtdbg.h>
 
 #define SOCKET_TABLE_STEP_LEN          4
diff --git a/components/utilities/ulog/ulog_def.h b/components/utilities/ulog/ulog_def.h
index 40b39de972..de5e82fcc5 100644
--- a/components/utilities/ulog/ulog_def.h
+++ b/components/utilities/ulog/ulog_def.h
@@ -54,7 +54,9 @@ extern "C" {
 
 #if !defined(LOG_TAG)
     /* compatible for rtdbg */
-    #if defined(DBG_SECTION_NAME)
+    #if defined(DBG_TAG)
+        #define LOG_TAG                DBG_TAG
+    #elif defined(DBG_SECTION_NAME)
         #define LOG_TAG                DBG_SECTION_NAME
     #else
         #define LOG_TAG                "NO_TAG"
@@ -63,7 +65,9 @@ extern "C" {
 
 #if !defined(LOG_LVL)
     /* compatible for rtdbg */
-    #if defined(DBG_LEVEL)
+    #if defined(DBG_LVL)
+        #define LOG_LVL                DBG_LVL
+    #elif defined(DBG_LEVEL)
         #define LOG_LVL                DBG_LEVEL
     #else
         #define LOG_LVL                LOG_LVL_DBG
diff --git a/components/utilities/utest/utest.c b/components/utilities/utest/utest.c
index 99775ab09f..f59f97bb64 100644
--- a/components/utilities/utest/utest.c
+++ b/components/utilities/utest/utest.c
@@ -15,14 +15,14 @@
 #include "utest.h"
 #include <utest_log.h>
 
-#undef DBG_SECTION_NAME
-#undef DBG_LEVEL
+#undef DBG_TAG
+#undef DBG_LVL
 
-#define DBG_SECTION_NAME          "utest"
+#define DBG_TAG          "utest"
 #ifdef UTEST_DEBUG
-#define DBG_LEVEL                 DBG_LOG
+#define DBG_LVL          DBG_LOG
 #else
-#define DBG_LEVEL                 DBG_INFO
+#define DBG_LVL          DBG_INFO
 #endif
 #include <rtdbg.h>
 
diff --git a/components/utilities/utest/utest_log.h b/components/utilities/utest/utest_log.h
index c4bd25a80b..0403268351 100644
--- a/components/utilities/utest/utest_log.h
+++ b/components/utilities/utest/utest_log.h
@@ -15,14 +15,14 @@
 
 #define UTEST_DEBUG
 
-#undef DBG_SECTION_NAME
-#undef DBG_LEVEL
+#undef DBG_TAG
+#undef DBG_LVL
 
-#define DBG_SECTION_NAME          "testcase"
+#define DBG_TAG              "testcase"
 #ifdef UTEST_DEBUG
-#define DBG_LEVEL                 DBG_LOG
+#define DBG_LVL              DBG_LOG
 #else
-#define DBG_LEVEL                 DBG_INFO
+#define DBG_LVL              DBG_INFO
 #endif
 #include <rtdbg.h>