diff options
| author | Bernard Xiong <[email protected]> | 2019-03-07 17:03:23 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-03-07 17:03:23 +0800 |
| commit | ce2cbb42ecb7f9633b648060708a13d0f478ef7c (patch) | |
| tree | 74c842d5da03de26d3e6b7399dc32eaaff86c4fa /components/utilities | |
| parent | a041f768a663120a43c41b19148e40df3e78f0d2 (diff) | |
| parent | 4f7c06f9232d30e768c1fd4925414e446e4ca585 (diff) | |
Merge pull request #2388 from armink/fix_rtdbg
Remove the DBG_COLOR and DBG_ENABLE definition.
Diffstat (limited to 'components/utilities')
| -rw-r--r-- | components/utilities/Kconfig | 6 | ||||
| -rw-r--r-- | components/utilities/ulog/ulog_def.h | 2 | ||||
| -rw-r--r-- | components/utilities/utest/utest.c | 4 | ||||
| -rw-r--r-- | components/utilities/utest/utest_log.h | 4 |
4 files changed, 1 insertions, 15 deletions
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) |