libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1617 from armink/fix_rtdbg 

Fix rtdbg
This commit is contained in:
Bernard Xiong 2018-07-14 06:46:50 +08:00 committed by GitHub
parent 2c0f31b9ed 6cd8658dad
commit 1758f5773e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/allwinner_tina/drivers/drv_gpio.c
View File

@ -28,7 +28,7 @@
#include "interrupt.h"
#define DBG_ENABLE
#define DBG_SECTION_NAME "[GPIO]"
#define DBG_SECTION_NAME "GPIO"
#define DBG_LEVEL DBG_WARNING
#define DBG_COLOR
#include <rtdbg.h>

2
bsp/allwinner_tina/drivers/drv_sdio.c
View File

@ -33,7 +33,7 @@
#include "drv_clock.h"
#define DBG_ENABLE
#define DBG_SECTION_NAME "[MMC]"
#define DBG_SECTION_NAME "MMC"
// #define DBG_LEVEL DBG_LOG
// #define DBG_LEVEL DBG_INFO
#define DBG_LEVEL DBG_WARNING

2
bsp/allwinner_tina/drivers/spi/drv_spi.c
View File

@ -34,7 +34,7 @@
#define SPI_BUS_MAX_CLK (30 * 1000 * 1000)
#define DBG_ENABLE
#define DBG_SECTION_NAME "[SPI]"
#define DBG_SECTION_NAME "SPI"
#define DBG_LEVEL DBG_WARNING
#define DBG_COLOR
#include <rtdbg.h>

2
bsp/allwinner_tina/drivers/spi/drv_spi_flash.c
View File

@ -27,7 +27,7 @@
#include <rtdevice.h>
#define DBG_ENABLE
#define DBG_SECTION_NAME "[FLASH]"
#define DBG_SECTION_NAME "FLASH"
#define DBG_LEVEL DBG_LOG
#define DBG_COLOR
#include <rtdbg.h>

2
bsp/imxrt1052-evk/drivers/drv_eth.c
View File

@ -42,7 +42,7 @@
//#define ETH_TX_DUMP
#define DBG_ENABLE
#define DBG_SECTION_NAME "[ETH]"
#define DBG_SECTION_NAME "ETH"
#define DBG_COLOR
#define DBG_LEVEL DBG_INFO
#include <rtdbg.h>

2
bsp/imxrt1052-evk/drivers/drv_eth_fire.c
View File

@ -42,7 +42,7 @@
//#define ETH_TX_DUMP
#define DBG_ENABLE
#define DBG_SECTION_NAME "[ETH]"
#define DBG_SECTION_NAME "ETH"
#define DBG_COLOR
#define DBG_LEVEL DBG_LOG
#include <rtdbg.h>

2
bsp/imxrt1052-evk/drivers/fsl_phy_fire.c
View File

@ -26,7 +26,7 @@
#include <rtthread.h>
#define DBG_ENABLE
#define DBG_SECTION_NAME "[PHY]"
#define DBG_SECTION_NAME "PHY"
#define DBG_COLOR
#define DBG_LEVEL DBG_LOG
#include <rtdbg.h>

2
bsp/qemu-vexpress-a9/drivers/audio/drv_pl041.c
View File

@ -29,7 +29,7 @@
#include "realview.h"
#define DBG_ENABLE
#define DBG_SECTION_NAME "[PL041]"
#define DBG_SECTION_NAME "PL041"
// #define DBG_LEVEL DBG_LOG
// #define DBG_LEVEL DBG_INFO
#define DBG_LEVEL DBG_WARNING

2
bsp/x1000/drivers/mmc/drv_mmc.c
View File

@ -34,7 +34,7 @@
#define PIO_THRESHOLD 64 /* use pio mode if data length < PIO_THRESHOLD */
#define DEBUG_ENABLE
#define DEBUG_SECTION_NAME "[SDIO]"
#define DEBUG_SECTION_NAME "SDIO"
#define DEBUG_LEVEL DBG_INFO
// #define DEBUG_LEVEL DBG_LOG
#define DEBUG_COLOR

2
components/dfs/include/dfs_private.h
View File

@ -4,7 +4,7 @@
#include <dfs.h>
// #define DBG_ENABLE
#define DBG_SECTION_NAME "[ DFS]"
#define DBG_SECTION_NAME "DFS"
#define DBG_COLOR
#define DBG_LEVEL DBG_LOG
#include <rtdbg.h>

2
components/drivers/serial/serial.c
View File

@ -43,7 +43,7 @@
// #define DEBUG_ENABLE
#define DEBUG_LEVEL DBG_LOG
#define DBG_SECTION_NAME "[UART]"
#define DBG_SECTION_NAME "UART"
#define DEBUG_COLOR
#include <rtdbg.h>

2
components/lwp/lwp.c
View File

@ -32,7 +32,7 @@
#include "lwp.h"
#define DBG_ENABLE
#define DBG_SECTION_NAME "[LWP]"
#define DBG_SECTION_NAME "LWP"
#define DBG_COLOR
#define DBG_LEVEL DBG_WARNING
#include <rtdbg.h>

2
components/lwp/lwp_mem.c
View File

@ -26,7 +26,7 @@
#include <lwp.h>
#define DBG_ENABLE
#define DBG_SECTION_NAME "[LWPMEM]"
#define DBG_SECTION_NAME "LWPMEM"
#define DBG_COLOR
#define DBG_LEVEL DBG_WARNING
#include <rtdbg.h>

2
components/lwp/lwp_syscall.c
View File

@ -27,7 +27,7 @@
#include <lwp_syscall.h>
#define DBG_ENABLE
#define DBG_SECTION_NAME "[LWP_CALL]"
#define DBG_SECTION_NAME "LWP_CALL"
#define DBG_COLOR
#define DBG_LEVEL DBG_WARNING
#include <rtdbg.h>

23
include/rtdbg.h
View File

@ -32,7 +32,7 @@
* In your C/C++ file, enable/disable DEBUG_ENABLE macro, and then include this
* header file.
*
* #define DBG_SECTION_NAME "[ MOD]"
* #define DBG_SECTION_NAME "MOD"
* #define DBG_ENABLE // enable debug macro
* #define DBG_LEVEL DBG_INFO
* #include <rtdbg.h> // must after of DEBUG_ENABLE or some other options
@ -81,10 +81,14 @@
* WHITE 37
*/
#ifdef DBG_COLOR
#define _DBG_COLOR(n) rt_kprintf("\033["#n"m")
#define _DBG_COLOR(n) rt_kprintf("\033["#n"m")
#define _DBG_LOG_HDR(lvl_name, color_n) \
rt_kprintf("\033["#color_n"m["lvl_name"/"DBG_SECTION_NAME"] ")
#else
#define _DBG_COLOR(n)
#endif
#define _DBG_LOG_HDR(lvl_name, color_n) \
rt_kprintf("["lvl_name"/"DBG_SECTION_NAME"] ")
#endif /* DBG_COLOR */
/*
* static debug routine
@ -94,12 +98,13 @@
{ \
switch(level) \
{ \
case DBG_ERROR: _DBG_COLOR(31); break; \
case DBG_WARNING: _DBG_COLOR(33); break; \
case DBG_INFO: _DBG_COLOR(32); break; \
case DBG_ERROR: _DBG_LOG_HDR("E", 31); break; \
case DBG_WARNING: _DBG_LOG_HDR("W", 33); break; \
case DBG_INFO: _DBG_LOG_HDR("I", 32); break; \
case DBG_LOG: _DBG_LOG_HDR("D", 0); break; \
default: break; \
} \
rt_kprintf(DBG_SECTION_NAME fmt, ##__VA_ARGS__); \
rt_kprintf(fmt, ##__VA_ARGS__); \
_DBG_COLOR(0); \
}
@ -131,17 +136,21 @@
rt_kprintf("\n"); \
}
#define dbg_raw(...) rt_kprintf(__VA_ARGS__);
#else
#define dbg_log(level, fmt, ...)
#define dbg_here
#define dbg_enter
#define dbg_exit
#define dbg_log_line(level, ...)
#define dbg_raw(...)
#endif
#define LOG_D(...) dbg_log_line(DBG_LOG , __VA_ARGS__)
#define LOG_I(...) dbg_log_line(DBG_INFO , __VA_ARGS__)
#define LOG_W(...) dbg_log_line(DBG_WARNING, __VA_ARGS__)
#define LOG_E(...) dbg_log_line(DBG_ERROR , __VA_ARGS__)
#define LOG_RAW(...) dbg_raw(__VA_ARGS__)
#endif /* RT_DBG_H__ */

2
src/signal.c
View File

@ -35,7 +35,7 @@
#endif
// #define DBG_ENABLE
#define DBG_SECTION_NAME "[SIGN]"
#define DBG_SECTION_NAME "SIGN"
#define DBG_COLOR
#define DBG_LEVEL DBG_LOG
#include <rtdbg.h>