Remove the DBG_COLOR and DBG_ENABLE definition.

27 files changed, 6 insertions, 66 deletions

diff --git a/components/dfs/include/dfs_private.h b/components/dfs/include/dfs_private.h
index e20680d9df..bfc71b3b35 100644
--- a/components/dfs/include/dfs_private.h
+++ b/components/dfs/include/dfs_private.h
@@ -12,10 +12,8 @@
 
 #include <dfs.h>
 
-// #define DBG_ENABLE
 #define DBG_SECTION_NAME	"DFS"
-#define DBG_COLOR
-#define DBG_LEVEL			DBG_LOG
+#define DBG_LEVEL			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 83e789a6e4..b2fd9ba430 100644
--- a/components/drivers/misc/adc.c
+++ b/components/drivers/misc/adc.c
@@ -15,10 +15,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME "adc"
 #define DBG_LEVEL DBG_INFO
-#define DBG_COLOR
 #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 23be319fc6..dcfbc0ca7b 100644
--- a/components/drivers/sdio/block_dev.c
+++ b/components/drivers/sdio/block_dev.c
@@ -13,14 +13,12 @@
 
 #include <drivers/mmcsd_core.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME               "SDIO"
 #ifdef RT_SDIO_DEBUG
 #define DBG_LEVEL                      DBG_LOG
 #else
 #define DBG_LEVEL                      DBG_INFO
 #endif /* RT_SDIO_DEBUG */
-#define DBG_COLOR
 #include <rtdbg.h>
 
 static rt_list_t blk_devices = RT_LIST_OBJECT_INIT(blk_devices);
@@ -369,7 +367,7 @@ rt_int32_t rt_mmcsd_blk_probe(struct rt_mmcsd_card *card)
         return err;
     }
 
-    LOG_I("probe mmcsd block device!");
+    LOG_D("probe mmcsd block device!");
 
     /* get the first sector to read partition table */
     sector = (rt_uint8_t *)rt_malloc(SECTOR_SIZE);
diff --git a/components/drivers/sdio/mmc.c b/components/drivers/sdio/mmc.c
index bbf0ff838c..5f9259ef52 100644
--- a/components/drivers/sdio/mmc.c
+++ b/components/drivers/sdio/mmc.c
@@ -11,14 +11,12 @@
 #include <drivers/mmcsd_core.h>
 #include <drivers/mmc.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME               "SDIO"
 #ifdef RT_SDIO_DEBUG
 #define DBG_LEVEL                      DBG_LOG
 #else
 #define DBG_LEVEL                      DBG_INFO
 #endif /* RT_SDIO_DEBUG */
-#define DBG_COLOR
 #include <rtdbg.h>
 
 static const rt_uint32_t tran_unit[] =
diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/mmcsd_core.c
index 2206960a69..160defa645 100644
--- a/components/drivers/sdio/mmcsd_core.c
+++ b/components/drivers/sdio/mmcsd_core.c
@@ -14,14 +14,12 @@
 #include <drivers/mmc.h>
 #include <drivers/sdio.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME               "SDIO"
 #ifdef RT_SDIO_DEBUG
 #define DBG_LEVEL                      DBG_LOG
 #else
 #define DBG_LEVEL                      DBG_INFO
 #endif /* RT_SDIO_DEBUG */
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #ifndef RT_MMCSD_STACK_SIZE
diff --git a/components/drivers/sdio/sd.c b/components/drivers/sdio/sd.c
index 69a4561fb0..f4e925507c 100644
--- a/components/drivers/sdio/sd.c
+++ b/components/drivers/sdio/sd.c
@@ -11,14 +11,12 @@
 #include <drivers/mmcsd_core.h>
 #include <drivers/sd.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME               "SDIO"
 #ifdef RT_SDIO_DEBUG
 #define DBG_LEVEL                      DBG_LOG
 #else
 #define DBG_LEVEL                      DBG_INFO
 #endif /* RT_SDIO_DEBUG */
-#define DBG_COLOR
 #include <rtdbg.h>
 
 static const rt_uint32_t tran_unit[] =
diff --git a/components/drivers/sdio/sdio.c b/components/drivers/sdio/sdio.c
index 6045c4ade8..b0516704fd 100644
--- a/components/drivers/sdio/sdio.c
+++ b/components/drivers/sdio/sdio.c
@@ -12,14 +12,12 @@
 #include <drivers/sdio.h>
 #include <drivers/sd.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME               "SDIO"
 #ifdef RT_SDIO_DEBUG
 #define DBG_LEVEL                      DBG_LOG
 #else
 #define DBG_LEVEL                      DBG_INFO
 #endif /* RT_SDIO_DEBUG */
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #ifndef RT_SDIO_STACK_SIZE
diff --git a/components/drivers/sensors/sensor.c b/components/drivers/sensors/sensor.c
index 0c21f04b6f..99f366ddac 100644
--- a/components/drivers/sensors/sensor.c
+++ b/components/drivers/sensors/sensor.c
@@ -10,10 +10,8 @@
 
 #include "sensor.h"
 
-#define DBG_ENABLE
 #define DBG_LEVEL DBG_INFO
 #define DBG_SECTION_NAME  "sensor"
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #include <string.h>
diff --git a/components/drivers/sensors/sensor_cmd.c b/components/drivers/sensors/sensor_cmd.c
index b6dd471988..07487c8866 100644
--- a/components/drivers/sensors/sensor_cmd.c
+++ b/components/drivers/sensors/sensor_cmd.c
@@ -10,10 +10,8 @@
 
 #include "sensor.h"
 
-#define DBG_ENABLE
 #define DBG_LEVEL DBG_INFO
 #define DBG_SECTION_NAME  "sensor.cmd"
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #include <stdlib.h>
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c
index 094c403656..13bf54e721 100644
--- a/components/drivers/serial/serial.c
+++ b/components/drivers/serial/serial.c
@@ -28,10 +28,8 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 
-// #define DEBUG_ENABLE
-#define DEBUG_LEVEL         DBG_LOG
+#define DBG_LEVEL           DBG_INFO
 #define DBG_SECTION_NAME    "UART"
-#define DEBUG_COLOR
 #include <rtdbg.h>
 
 #ifdef RT_USING_POSIX
diff --git a/components/drivers/wlan/wlan_cfg.c b/components/drivers/wlan/wlan_cfg.c
index 27da9bc24e..00e9dbc83e 100644
--- a/components/drivers/wlan/wlan_cfg.c
+++ b/components/drivers/wlan/wlan_cfg.c
@@ -11,14 +11,12 @@
 #include <rtthread.h>
 #include <wlan_cfg.h>
 
-#define DBG_ENABLE
 #ifdef RT_WLAN_CFG_DEBUG
 #define DBG_LEVEL DBG_LOG
 #else
 #define DBG_LEVEL DBG_INFO
 #endif
 #define DBG_SECTION_NAME  "WLAN.cfg"
-#define DBG_COLOR
 #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 eac1d0f975..3f4adf35ad 100644
--- a/components/drivers/wlan/wlan_dev.c
+++ b/components/drivers/wlan/wlan_dev.c
@@ -13,14 +13,12 @@
 #include <wlan_dev.h>
 #include <wlan_prot.h>
 
-#define DBG_ENABLE
 #ifdef RT_WLAN_DEV_DEBUG
 #define DBG_LEVEL DBG_LOG
 #else
 #define DBG_LEVEL DBG_INFO
 #endif
 #define DBG_SECTION_NAME  "WLAN.dev"
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #ifndef RT_DEVICE
diff --git a/components/drivers/wlan/wlan_lwip.c b/components/drivers/wlan/wlan_lwip.c
index 2f8bcefd0d..052c2afd2e 100644
--- a/components/drivers/wlan/wlan_lwip.c
+++ b/components/drivers/wlan/wlan_lwip.c
@@ -21,14 +21,12 @@
 #include <dhcp_server.h>
 #endif
 
-#define DBG_ENABLE
 #ifdef RT_WLAN_LWIP_DEBUG
 #define DBG_LEVEL DBG_LOG
 #else
 #define DBG_LEVEL DBG_INFO
 #endif
 #define DBG_SECTION_NAME  "WLAN.lwip"
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #ifndef IPADDR_STRLEN_MAX
diff --git a/components/drivers/wlan/wlan_mgnt.c b/components/drivers/wlan/wlan_mgnt.c
index ac0731d06c..ced5bfa1c2 100644
--- a/components/drivers/wlan/wlan_mgnt.c
+++ b/components/drivers/wlan/wlan_mgnt.c
@@ -16,14 +16,13 @@
 #include <wlan_prot.h>
 #include <wlan_workqueue.h>
 
-#define DBG_ENABLE
+
 #ifdef RT_WLAN_MGNT_DEBUG
 #define DBG_LEVEL DBG_LOG
 #else
 #define DBG_LEVEL DBG_INFO
 #endif
 #define DBG_SECTION_NAME  "WLAN.mgnt"
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #ifndef RT_WLAN_DEVICE
diff --git a/components/drivers/wlan/wlan_prot.c b/components/drivers/wlan/wlan_prot.c
index ec5e419bc4..48adbc48f3 100644
--- a/components/drivers/wlan/wlan_prot.c
+++ b/components/drivers/wlan/wlan_prot.c
@@ -13,14 +13,12 @@
 #include <wlan_dev.h>
 #include <wlan_prot.h>
 
-#define DBG_ENABLE
 #ifdef RT_WLAN_PROT_DEBUG
 #define DBG_LEVEL DBG_LOG
 #else
 #define DBG_LEVEL DBG_INFO
 #endif
 #define DBG_SECTION_NAME  "WLAN.prot"
-#define DBG_COLOR
 #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 f65ac95d08..23823afae0 100644
--- a/components/drivers/wlan/wlan_workqueue.c
+++ b/components/drivers/wlan/wlan_workqueue.c
@@ -13,10 +13,8 @@
 #include <wlan_workqueue.h>
 #include <ipc/workqueue.h>
 
-#define DBG_ENABLE
 #define DBG_LEVEL DBG_INFO
 #define DBG_SECTION_NAME  "WLAN.work"
-#define DBG_COLOR
 #include <rtdbg.h>
 
 struct rt_wlan_work
diff --git a/components/libc/libdl/dlelf.c b/components/libc/libdl/dlelf.c
index 6d83424b80..4557ee3458 100644
--- a/components/libc/libdl/dlelf.c
+++ b/components/libc/libdl/dlelf.c
@@ -12,9 +12,7 @@
 #include "dlelf.h"
 
 #define DBG_SECTION_NAME    "DLMD"
-#define DBG_ENABLE          // enable debug macro
 #define DBG_LEVEL           DBG_INFO
-#define DBG_COLOR
 #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 61ffbfc772..0029c01728 100644
--- a/components/libc/libdl/dlmodule.c
+++ b/components/libc/libdl/dlmodule.c
@@ -17,9 +17,7 @@
 #include <dfs_posix.h>
 
 #define DBG_SECTION_NAME    "DLMD"
-#define DBG_ENABLE          // enable debug macro
 #define DBG_LEVEL           DBG_INFO
-#define DBG_COLOR
 #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 84d6515ac6..e1ba26f21c 100644
--- a/components/lwp/lwp.c
+++ b/components/lwp/lwp.c
@@ -19,9 +19,7 @@
 
 #include "lwp.h"
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME    "LWP"
-#define DBG_COLOR
 #define DBG_LEVEL           DBG_WARNING
 #include <rtdbg.h>
 
diff --git a/components/lwp/lwp_mem.c b/components/lwp/lwp_mem.c
index ebc878494a..e733166934 100644
--- a/components/lwp/lwp_mem.c
+++ b/components/lwp/lwp_mem.c
@@ -11,9 +11,7 @@
 #include <rtthread.h>
 #include <lwp.h>
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME    "LWPMEM"
-#define DBG_COLOR
 #define DBG_LEVEL           DBG_WARNING
 #include <rtdbg.h>
 
diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c
index 5d4bbf6d91..723786f1cd 100644
--- a/components/lwp/lwp_syscall.c
+++ b/components/lwp/lwp_syscall.c
@@ -24,9 +24,7 @@
 #define SYSCALL_NET(f) ((void*)sys_notimpl)
 #endif
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME    "LWP_CALL"
-#define DBG_COLOR
 #define DBG_LEVEL           DBG_WARNING
 #include <rtdbg.h>
 
diff --git a/components/net/at/include/at_log.h b/components/net/at/include/at_log.h
index 278763d30e..fe8766ba95 100644
--- a/components/net/at/include/at_log.h
+++ b/components/net/at/include/at_log.h
@@ -12,9 +12,6 @@
  * NOTE: DO NOT include this file on the header file.
  */
 
-#define DBG_ENABLE
-#define DBG_COLOR
-
 #ifndef LOG_TAG
 #define DBG_SECTION_NAME               "at"
 #else
diff --git a/components/net/sal_socket/src/sal_socket.c b/components/net/sal_socket/src/sal_socket.c
index dba8e66254..771a56f061 100644
--- a/components/net/sal_socket/src/sal_socket.c
+++ b/components/net/sal_socket/src/sal_socket.c
@@ -19,10 +19,8 @@
 #endif
 #include <sal.h>
 
-#define DBG_ENABLE
-#define DBG_SECTION_NAME               "SAL_SOC"
+#define DBG_SECTION_NAME               "SAL_SKT"
 #define DBG_LEVEL                      DBG_INFO
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #define SOCKET_TABLE_STEP_LEN          4
diff --git a/components/utilities/Kconfig b/components/utilities/Kconfig
index 1175006a58..504a56691d 100644
--- a/components/utilities/Kconfig
+++ b/components/utilities/Kconfig
@@ -222,12 +222,6 @@ config RT_USING_ULOG
             select ULOG_OUTPUT_TIME
             select ULOG_USING_FILTER
             default n
-            
-        config ULOG_SW_VERSION_NUM
-            hex
-            default 0x00101
-            help
-                sfotware module version number
     endif
 
 config RT_USING_UTEST
diff --git a/components/utilities/ulog/ulog_def.h b/components/utilities/ulog/ulog_def.h
index e7c033f71c..40b39de972 100644
--- a/components/utilities/ulog/ulog_def.h
+++ b/components/utilities/ulog/ulog_def.h
@@ -47,7 +47,7 @@ extern "C" {
 #define DBG_INFO                       LOG_LVL_INFO
 #define DBG_LOG                        LOG_LVL_DBG
 #define dbg_log(level, ...)                                \
-    if ((level) <= DBG_LEVEL)                              \
+    if ((level) <= LOG_LVL)                                \
     {                                                      \
         ulog_output(level, LOG_TAG, RT_FALSE, __VA_ARGS__);\
     }
diff --git a/components/utilities/utest/utest.c b/components/utilities/utest/utest.c
index f7348b3be4..7bc2c93656 100644
--- a/components/utilities/utest/utest.c
+++ b/components/utilities/utest/utest.c
@@ -17,17 +17,13 @@
 
 #undef DBG_SECTION_NAME
 #undef DBG_LEVEL
-#undef DBG_COLOR
-#undef DBG_ENABLE
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME          "utest"
 #ifdef UTEST_DEBUG
 #define DBG_LEVEL                 DBG_LOG
 #else
 #define DBG_LEVEL                 DBG_INFO
 #endif
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #if RT_CONSOLEBUF_SIZE < 256
diff --git a/components/utilities/utest/utest_log.h b/components/utilities/utest/utest_log.h
index 9f38d3f9c8..c4bd25a80b 100644
--- a/components/utilities/utest/utest_log.h
+++ b/components/utilities/utest/utest_log.h
@@ -17,17 +17,13 @@
 
 #undef DBG_SECTION_NAME
 #undef DBG_LEVEL
-#undef DBG_COLOR
-#undef DBG_ENABLE
 
-#define DBG_ENABLE
 #define DBG_SECTION_NAME          "testcase"
 #ifdef UTEST_DEBUG
 #define DBG_LEVEL                 DBG_LOG
 #else
 #define DBG_LEVEL                 DBG_INFO
 #endif
-#define DBG_COLOR
 #include <rtdbg.h>
 
 #define UTEST_LOG_ALL    (1u)