diff --git a/src/dev/sdc.c b/src/dev/sdc.c index dd138f9..5279d60 100644 --- a/src/dev/sdc.c +++ b/src/dev/sdc.c @@ -331,7 +331,7 @@ short sdc_write(long lba, const unsigned char * buffer, short size) { short sdc_status() { short status = g_sdc_status; - TRACE("sdc_status"); + TRACE1("sdc_status, status=0x%x",(int)status); if (sdc_detected()) { // Add the PRESENT flag, if the card is inserted @@ -343,7 +343,7 @@ short sdc_status() { status |= SDC_STAT_PROTECTED; } - TRACE1("sdc_status: %x", (int)status); + TRACE1("sdc_status: %x", (short)status); return status; } diff --git a/src/foenixmcp.c b/src/foenixmcp.c index 575007e..8aa6042 100644 --- a/src/foenixmcp.c +++ b/src/foenixmcp.c @@ -268,13 +268,13 @@ void initialize() { if (res = cli_init()) { log_num(LOG_ERROR, "FAILED: CLI initialization", res); } else { - log(LOG_INFO, "CLI initialized."); + INFO("CLI initialized."); } if (res = fsys_init()) { log_num(LOG_ERROR, "FAILED: file system initialization", res); } else { - log(LOG_INFO, "File system initialized."); + INFO("File system initialized."); } } diff --git a/src/log.h b/src/log.h index dfc42ff..2dbd42c 100644 --- a/src/log.h +++ b/src/log.h @@ -166,6 +166,8 @@ extern void log_c(short log_level, char c); # define TRACE3(a,b,c,d) trace(a, b, c, d) # define TRACE4(a,b,c,d,e) trace(a, b, c, d, e) # define TRACE5(a,b,c,d,e,f) trace(a, b, c, d, e, f) +# define TRACE6(a,b,c,d,e,f,g) trace(a, b, c, d, e, f, g) +# define TRACE7(a,b,c,d,e,f,g,h) trace(a, b, c, d, e, f, g, h) #else # define TRACE(m) # define TRACE1(a,b) @@ -173,6 +175,8 @@ extern void log_c(short log_level, char c); # define TRACE3(a,b,c,d) # define TRACE4(a,b,c,d,e) # define TRACE5(a,b,c,d,e,f) +# define TRACE6(a,b,c,d,e,f,g) +# define TRACE7(a,b,c,d,e,f,g,h) #endif #define TRACEC(c) log_c(LOG_TRACE, c);