libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #160 from grissiom/misc-fix 

logtrace: cleanup code and fix compiling warnings
This commit is contained in:
Bernard Xiong 2013-09-23 05:28:03 -07:00
parent 29871c0d84 2a20337707
commit 0b844aa82d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/utilities/logtrace/log_trace.c
View File

@ -41,7 +41,7 @@ static struct rt_device _log_device;
static rt_device_t _traceout_device = RT_NULL; static rt_device_t _traceout_device = RT_NULL;
/* define a default lg session. The name is empty. */ /* define a default lg session. The name is empty. */
static struct log_trace_session _def_session = {{0}, LOG_TRACE_LEVEL_INFO}; static struct log_trace_session _def_session = {{"\0"}, LOG_TRACE_LEVEL_INFO};
static struct log_trace_session *_the_sessions[LOG_TRACE_MAX_SESSION] = {&_def_session}; static struct log_trace_session *_the_sessions[LOG_TRACE_MAX_SESSION] = {&_def_session};
/* there is a default session at least */ /* there is a default session at least */
static rt_uint16_t _the_sess_nr = 1; static rt_uint16_t _the_sess_nr = 1;
@ -272,7 +272,7 @@ static void _lg_fmtout(
_trace_buf[0] = ']'; _trace_buf[0] = ']';
ptr = &_trace_buf[1]; ptr = &_trace_buf[1];
length = vsnprintf(ptr, LOG_TRACE_BUFSZ, fmt, argptr); length = rt_vsnprintf(ptr, LOG_TRACE_BUFSZ, fmt, argptr);
if (length >= LOG_TRACE_BUFSZ) if (length >= LOG_TRACE_BUFSZ)
length = LOG_TRACE_BUFSZ - 1; length = LOG_TRACE_BUFSZ - 1;

18
components/utilities/logtrace/log_trace.h
View File

@ -31,9 +31,10 @@
#define LOG_TRACE_LEVEL_MASK 0x0f #define LOG_TRACE_LEVEL_MASK 0x0f
#define LOG_TRACE_LEVEL_NOTRACE 0x00 #define LOG_TRACE_LEVEL_NOTRACE 0x00
#define LOG_TRACE_LEVEL_ERROR 0x01 #define LOG_TRACE_LEVEL_ERROR 0x01
#define LOG_TRACE_LEVEL_WARNING 0x02 #define LOG_TRACE_LEVEL_WARNING 0x03
#define LOG_TRACE_LEVEL_INFO 0x03 #define LOG_TRACE_LEVEL_INFO 0x05
#define LOG_TRACE_LEVEL_DEBUG 0x04 #define LOG_TRACE_LEVEL_VERBOSE 0x07
#define LOG_TRACE_LEVEL_DEBUG 0x09
#define LOG_TRACE_LEVEL_ALL 0x0f #define LOG_TRACE_LEVEL_ALL 0x0f
#ifndef LOG_TRACE_LEVEL_DEFAULT #ifndef LOG_TRACE_LEVEL_DEFAULT
@ -41,9 +42,10 @@
#endif #endif
#define LOG_TRACE_ERROR "<1>" #define LOG_TRACE_ERROR "<1>"
#define LOG_TRACE_WARNING "<2>" #define LOG_TRACE_WARNING "<3>"
#define LOG_TRACE_INFO "<3>" #define LOG_TRACE_INFO "<5>"
#define LOG_TRACE_DEBUG "<4>" #define LOG_TRACE_VERBOSE "<7>"
#define LOG_TRACE_DEBUG "<9>"
#define LOG_TRACE_OPT_NOTS 0x10 /* no timestamp */ #define LOG_TRACE_OPT_NOTS 0x10 /* no timestamp */
#define LOG_TRACE_OPT_LN 0x20 /* terminate the current line */ #define LOG_TRACE_OPT_LN 0x20 /* terminate the current line */
@ -140,12 +142,12 @@ rt_err_t log_trace_set_device(const char *device_name);
void log_trace_flush(void); void log_trace_flush(void);
#ifdef RT_USING_DFS
/** set the backend to file */ /** set the backend to file */
void log_trace_set_file(const char *filename); void log_trace_set_file(const char *filename);
/* log trace for NAND Flash */
void log_trace_nand_init(const char *nand_device);
void log_trace_file_init(const char *filename); void log_trace_file_init(const char *filename);
#endif /* RT_USING_DFS */
#endif #endif