Merge pull request #2568 from armink/fix_rtdbg

Fix rtdbg

bsp/allwinner_tina/drivers/drv_gpio.c

@@ -27,8 +27,8 @@
 #include "drv_gpio.h"
 #include "interrupt.h"
 
-#define DBG_SECTION_NAME  "GPIO"
-#define DBG_LEVEL         DBG_WARNING
+#define DBG_TAG  "GPIO"
+#define DBG_LVL  DBG_WARNING
 #include <rtdbg.h>
 
 #define readl(addr)           (*(volatile unsigned int *)(addr))

bsp/allwinner_tina/drivers/drv_sdio.c

@@ -33,11 +33,11 @@
 #include "drv_clock.h"
 
 
-#define DBG_SECTION_NAME  "MMC"
-// #define DBG_LEVEL DBG_LOG    
-// #define DBG_LEVEL DBG_INFO   
-#define DBG_LEVEL DBG_WARNING
-// #define DBG_LEVEL DBG_ERROR  
+#define DBG_TAG  "MMC"
+// #define DBG_LVL DBG_LOG    
+// #define DBG_LVL DBG_INFO   
+#define DBG_LVL DBG_WARNING
+// #define DBG_LVL DBG_ERROR  
 #include <rtdbg.h>
 
 #ifdef RT_USING_SDIO

bsp/allwinner_tina/drivers/spi/drv_spi.c

@@ -35,11 +35,11 @@
 
 //#define DEBUG
 
-#define DBG_SECTION_NAME  "SPI"
+#define DBG_TAG  "SPI"
 #ifdef DEBUG
-#define DBG_LEVEL         DBG_LOG
+#define DBG_LVL  DBG_LOG
 #else
-#define DBG_LEVEL         DBG_WARNING
+#define DBG_LVL  DBG_WARNING
 #endif /* DEBUG */
 #include <rtdbg.h>
 

bsp/allwinner_tina/drivers/spi/drv_spi_flash.c

@@ -26,8 +26,8 @@
 #include <rthw.h>
 #include <rtdevice.h>
 
-#define DBG_SECTION_NAME  "FLASH"
-#define DBG_LEVEL         DBG_LOG
+#define DBG_TAG  "FLASH"
+#define DBG_LVL  DBG_LOG
 #include <rtdbg.h>
 
 #define SPI_FLASH_DEVICE_NAME       "spi00"

bsp/amebaz/drivers/wlan/drv_wifi.c

@@ -28,8 +28,8 @@
 #include "drv_wlan.h"
 #include "drv_wifi.h"
 
-#define DBG_LEVEL DBG_INFO
-#define DBG_SECTION_NAME  "WIFI"
+#define DBG_LVL DBG_INFO
+#define DBG_TAG "WIFI"
 #include <rtdbg.h>
 
 #define MAX_ADDR_LEN          (6)

bsp/imxrt/Libraries/imxrt1021/drivers/drv_eth.c

@@ -40,10 +40,9 @@
 //#define ETH_RX_DUMP
 //#define ETH_TX_DUMP
 
-#define DBG_ENABLE
-#define DBG_SECTION_NAME    "ETH"
-#define DBG_COLOR
-#define DBG_LEVEL           DBG_INFO
+
+#define DBG_TAG    "ETH"
+#define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
 
 #define MAX_ADDR_LEN 6

bsp/imxrt/Libraries/imxrt1021/drivers/drv_flexspi_nor.c

@@ -14,8 +14,8 @@
 #include <rthw.h>
 #include "drv_flexspi.h"
 
-#define DBG_SECTION_NAME  "FLEXSPI"
-#define DBG_LEVEL         DBG_LOG
+#define DBG_TAG  "FLEXSPI"
+#define DBG_LVL  DBG_LOG
 #include <rtdbg.h>
 
 #define FLEXSPI_CLOCK kCLOCK_FlexSpi

bsp/imxrt/Libraries/imxrt1050/drivers/drv_eth.c

@@ -46,8 +46,8 @@
 //#define ETH_RX_DUMP
 //#define ETH_TX_DUMP
 
-#define DBG_SECTION_NAME    "ETH"
-#define DBG_LEVEL           DBG_INFO
+#define DBG_TAG    "ETH"
+#define DBG_LVL    DBG_INFO
 #include <rtdbg.h>
 
 #define MAX_ADDR_LEN 6

bsp/imxrt/Libraries/imxrt1050/drivers/drv_eth_fire.c

@@ -37,8 +37,8 @@
 //#define ETH_RX_DUMP
 //#define ETH_TX_DUMP
 
-#define DBG_SECTION_NAME    "ETH"
-#define DBG_LEVEL           DBG_LOG
+#define DBG_TAG    "ETH"
+#define DBG_LVL    DBG_LOG
 #include <rtdbg.h>
 
 #define MAX_ADDR_LEN 6

bsp/imxrt/Libraries/imxrt1050/drivers/drv_flexspi_hyper.c

@@ -14,8 +14,8 @@
 #include <rthw.h>
 #include "drv_flexspi.h"
 
-#define DBG_SECTION_NAME  "Hyper"
-#define DBG_LEVEL         DBG_LOG
+#define DBG_TAG  "Hyper"
+#define DBG_LVL  DBG_LOG
 #include <rtdbg.h>
 
 #define FLEXSPI_CLOCK kCLOCK_FlexSpi

bsp/imxrt/Libraries/imxrt1050/drivers/drv_flexspi_nor.c

@@ -13,8 +13,8 @@
 #include <rthw.h>
 #include "drv_flexspi.h"
 
-#define DBG_SECTION_NAME  "FLEXSPI"
-#define DBG_LEVEL         DBG_LOG
+#define DBG_TAG  "FLEXSPI"
+#define DBG_LVL  DBG_LOG
 #include <rtdbg.h>
 
 #define FLEXSPI_CLOCK kCLOCK_FlexSpi

bsp/k210/driver/drv_gpio.c

@@ -20,8 +20,8 @@
 #include <string.h>
 
 #define DBG_ENABLE
-#define DBG_SECTION_NAME  "PIN"
-#define DBG_LEVEL         DBG_WARNING
+#define DBG_TAG  "PIN"
+#define DBG_LVL  DBG_WARNING
 #define DBG_COLOR
 #include <rtdbg.h>
 

bsp/k210/driver/drv_lcd.c

@@ -21,10 +21,8 @@
 #include <drv_io_config.h>
 #include <rthw.h>
 
-#define DBG_ENABLE
-#define DBG_SECTION_NAME  "LCD"
-#define DBG_LEVEL         DBG_WARNING
-#define DBG_COLOR
+#define DBG_TAG  "LCD"
+#define DBG_LVL  DBG_WARNING
 #include <rtdbg.h>
 
 #define NO_OPERATION            0x00

bsp/qemu-vexpress-a9/drivers/audio/drv_pl041.c

@@ -28,11 +28,11 @@
 #include "drv_ac97.h"
 #include "realview.h"
 
-#define DBG_SECTION_NAME  "PL041"
-// #define DBG_LEVEL         DBG_LOG
-// #define DBG_LEVEL         DBG_INFO
-#define DBG_LEVEL         DBG_WARNING
-// #define DBG_LEVEL         DBG_ERROR
+#define DBG_TAG  "PL041"
+// #define DBG_LVL         DBG_LOG
+// #define DBG_LVL         DBG_INFO
+#define DBG_LVL  DBG_WARNING
+// #define DBG_LVL         DBG_ERROR
 #include <rtdbg.h>
 
 #define FRAME_PERIOD_US    (50)

bsp/qemu-vexpress-a9/drivers/drv_keyboard.c

@@ -6,7 +6,7 @@
 #include "interrupt.h"
 #include "drv_keyboard.h"
 
-#define DBG_LEVEL DBG_INFO
+#define DBG_LVL DBG_INFO
 #include "rtdbg.h"
 
 #define KEYBOARD_ADDRESS    (0x10006000)

bsp/qemu-vexpress-a9/drivers/drv_mouse.c

@@ -7,8 +7,8 @@
 #include "drv_mouse.h"
 #include "drv_clcd.h"
 
-#define DBG_SECTION_NAME "drv.mouse"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "drv.mouse"
+#define DBG_LVL DBG_INFO
 #include "rtdbg.h"
 
 #define MOUSE_ADDRESS    (0x10007000)

bsp/qemu-vexpress-a9/drivers/drv_sdio.c

@@ -77,8 +77,8 @@
 #define PL180_CLR_DAT_END       (1 << 8)
 #define PL180_CLR_DAT_BLK_END   (1 << 10)
 
-#define DBG_SECTION_NAME "drv.sdio"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "drv.sdio"
+#define DBG_LVL DBG_INFO
 #include "rtdbg.h"
 
 struct sdhci_pl180_pdata_t

bsp/stm32/libraries/HAL_Drivers/drv_log.h

@@ -13,15 +13,15 @@
  */
 
 #ifndef LOG_TAG
-#define DBG_SECTION_NAME               "drv"
+#define DBG_TAG               "drv"
 #else
-#define DBG_SECTION_NAME               LOG_TAG
+#define DBG_TAG               LOG_TAG
 #endif /* LOG_TAG */
 
 #ifdef DRV_DEBUG
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO
+#define DBG_LVL               DBG_INFO
 #endif /* DRV_DEBUG */
 
 #include <rtdbg.h>

bsp/stm32/stm32f103-fire-arbitrary/board/ports/sdcard_port.c

@@ -16,8 +16,8 @@
 #include <dfs_fs.h>
 #include <dfs_posix.h>
 
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32/stm32f407-atk-explorer/board/ports/sdcard_port.c

@@ -16,8 +16,8 @@
 #include <dfs_fs.h>
 #include <dfs_posix.h>
 
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32/stm32f429-armfly-v6/board/ports/sdcard_port.c

@@ -16,8 +16,8 @@
 #include <dfs_fs.h>
 #include <dfs_posix.h>
 
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32/stm32f429-atk-apollo/board/ports/sdcard_port.c

@@ -16,8 +16,8 @@
 #include <dfs_fs.h>
 #include <dfs_posix.h>
 
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32/stm32f429-fire-challenger/board/ports/sdcard_port.c

@@ -17,8 +17,8 @@
 #include <dfs_posix.h>
 #include "drv_gpio.h"
 
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 #define WIFI_RESET_PIN                 GET_PIN(G,  9)

bsp/stm32/stm32f746-st-disco/board/ports/sdcard_port.c

@@ -16,8 +16,8 @@
 #include <dfs_fs.h>
 #include <dfs_posix.h>
 
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32/stm32f767-atk-apollo/board/ports/sdcard_port.c

@@ -16,8 +16,8 @@
 #include <dfs_fs.h>
 #include <dfs_posix.h>
 
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32/stm32f767-fire-challenger/board/ports/sdcard_port.c

@@ -17,9 +17,8 @@
 #include <dfs_posix.h>
 #include "drv_gpio.h"
 
-
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 #define WIFI_RESET_PIN                 GET_PIN(G,  9)

bsp/stm32/stm32l475-atk-pandora/board/ports/sdcard_port.c

@@ -18,9 +18,8 @@
 #include "drv_spi.h"
 #include "spi_msd.h"
 
-
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32/stm32l496-ali-developer/board/ports/sdcard_port.c

@@ -16,9 +16,8 @@
 #include <dfs_fs.h>
 #include <dfs_posix.h>
 
-
-#define DBG_SECTION_NAME  "app.card"
-#define DBG_LEVEL DBG_INFO
+#define DBG_TAG "app.card"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 void sd_mount(void *parameter)

bsp/stm32f429-apollo/drivers/audio/drv_mic.c

@@ -18,8 +18,8 @@
 #include "drv_wm8978.h"
 #include <stm32f4xx.h>
 
-#define DBG_LEVEL DBG_INFO
-#define DBG_SECTION_NAME    "MIC"
+#define DBG_TAG "MIC"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 struct micphone_device

bsp/stm32f429-apollo/drivers/audio/drv_sound.c

@@ -19,8 +19,8 @@
 #include "drv_wm8978.h"
 #include <stm32f4xx.h>
 
-#define DBG_LEVEL DBG_LOG
-#define DBG_SECTION_NAME    "Sound"
+#define DBG_TAG "Sound"
+#define DBG_LVL DBG_LOG
 #include <rtdbg.h>
 
 /**

bsp/w60x/drivers/drv_wifi.c

@@ -14,10 +14,8 @@
 #include "wm_wifi.h"
 #include "drv_wifi.h"
 
-#define DBG_ENABLE
-#define DBG_LEVEL DBG_INFO
-#define DBG_SECTION_NAME  "WIFI"
-#define DBG_COLOR
+#define DBG_TAG "WIFI"
+#define DBG_LVL DBG_INFO
 #include <rtdbg.h>
 
 #include "wm_ram_config.h"

bsp/x1000/drivers/mmc/drv_mmc.c

@@ -33,8 +33,8 @@
 #define DMA_ALIGN       (32U)
 #define PIO_THRESHOLD       64  /* use pio mode if data length < PIO_THRESHOLD */
 
-#define DBG_SECTION_NAME  "SDIO"
-#define DBG_LEVEL         DBG_INFO
+#define DBG_TAG  "SDIO"
+#define DBG_LVL  DBG_INFO
 #include <rtdbg.h>
 
 /*

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"

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)

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>
 

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>
 

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>
 

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>
 

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>
 

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>

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>

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

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))

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

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

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

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

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

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)

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;

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);

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

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)

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>

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

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

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>
 

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>
 

examples/network/tcpclient.c

@@ -12,11 +12,11 @@
 
 #define DEBUG_TCP_CLIENT
 
-#define DBG_SECTION_NAME               "TCP"
+#define DBG_TAG               "TCP"
 #ifdef DEBUG_TCP_CLIENT
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO /* DBG_ERROR */
+#define DBG_LVL               DBG_INFO /* DBG_ERROR */
 #endif
 #include <rtdbg.h>
 

examples/network/tcpserver.c

@@ -12,11 +12,11 @@
 
 #define DEBUG_TCP_SERVER
 
-#define DBG_SECTION_NAME               "TCP"
+#define DBG_TAG               "TCP"
 #ifdef DEBUG_TCP_SERVER
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO /* DBG_ERROR */
+#define DBG_LVL               DBG_INFO /* DBG_ERROR */
 #endif
 #include <rtdbg.h>
 

examples/network/udpclient.c

@@ -5,11 +5,11 @@
 
 #define DEBUG_UDP_CLIENT
 
-#define DBG_SECTION_NAME               "UDP"
+#define DBG_TAG               "UDP"
 #ifdef DEBUG_UDP_CLIENT
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO /* DBG_ERROR */
+#define DBG_LVL               DBG_INFO /* DBG_ERROR */
 #endif
 #include <rtdbg.h>
 

examples/network/udpserver.c

@@ -12,11 +12,11 @@
 
 #define DEBUG_UDP_SERVER
 
-#define DBG_SECTION_NAME               "UDP"
+#define DBG_TAG               "UDP"
 #ifdef DEBUG_UDP_SERVER
-#define DBG_LEVEL                      DBG_LOG
+#define DBG_LVL               DBG_LOG
 #else
-#define DBG_LEVEL                      DBG_INFO /* DBG_ERROR */
+#define DBG_LVL               DBG_INFO /* DBG_ERROR */
 #endif
 #include <rtdbg.h>
 

include/rtdbg.h

@@ -18,9 +18,9 @@
  * In your C/C++ file, enable/disable DEBUG_ENABLE macro, and then include this
  * header file.
  *
- * #define DBG_SECTION_NAME    "MOD"
- * #define DBG_LEVEL           DBG_INFO
- * #include <rtdbg.h>          // must after of DBG_LEVEL, DBG_SECTION_NAME or other options
+ * #define DBG_TAG           "MOD_TAG"
+ * #define DBG_LVL           DBG_INFO
+ * #include <rtdbg.h>          // must after of DBG_LVL, DBG_TAG or other options
  *
  * Then in your C/C++ file, you can use LOG_X macro to print out logs:
  * LOG_D("this is a debug log!");
@@ -53,15 +53,29 @@
 #define DBG_INFO            2
 #define DBG_LOG             3
 
+#ifdef DBG_TAG
+#ifndef DBG_SECTION_NAME
+#define DBG_SECTION_NAME    DBG_TAG
+#endif
+#else
+/* compatible with old version */
 #ifndef DBG_SECTION_NAME
 #define DBG_SECTION_NAME    "DBG"
 #endif
+#endif /* DBG_TAG */
 
 #ifdef DBG_ENABLE
 
+#ifdef DBG_LVL
+#ifndef DBG_LEVEL
+#define DBG_LEVEL         DBG_LVL
+#endif
+#else
+/* compatible with old version */
 #ifndef DBG_LEVEL
 #define DBG_LEVEL         DBG_WARNING
 #endif
+#endif /* DBG_LVL */
 
 /*
  * The color for terminal (foreground)

src/signal.c

@@ -22,8 +22,8 @@
 #define RT_SIG_INFO_MAX 32
 #endif
 
-#define DBG_SECTION_NAME    "SIGN"
-#define DBG_LEVEL           DBG_INFO
+#define DBG_TAG    "SIGN"
+#define DBG_LVL           DBG_INFO
 #include <rtdbg.h>
 
 #define sig_mask(sig_no)    (1u << sig_no)