From eebeb53d65683018eb33cf3710d0cb070c12ef4f Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Thu, 4 Aug 2011 17:40:25 +0000 Subject: Introduce msg_*dbg2 Corresponding to flashrom svn r1404. Signed-off-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- cli_output.c | 3 +++ flash.h | 6 +++++- flashrom.8 | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cli_output.c b/cli_output.c index 1c85f7a4..2a67bea2 100644 --- a/cli_output.c +++ b/cli_output.c @@ -33,6 +33,9 @@ int print(int type, const char *fmt, ...) output_type = stderr; break; case MSG_BARF: + if (verbose < 3) + return 0; + case MSG_DEBUG2: if (verbose < 2) return 0; case MSG_DEBUG: diff --git a/flash.h b/flash.h index 5b49e9d5..4b1cca24 100644 --- a/flash.h +++ b/flash.h @@ -233,7 +233,8 @@ int print(int type, const char *fmt, ...) __attribute__((format(printf, 2, 3))); #define MSG_ERROR 0 #define MSG_INFO 1 #define MSG_DEBUG 2 -#define MSG_BARF 3 +#define MSG_DEBUG2 3 +#define MSG_BARF 4 #define msg_gerr(...) print(MSG_ERROR, __VA_ARGS__) /* general errors */ #define msg_perr(...) print(MSG_ERROR, __VA_ARGS__) /* programmer errors */ #define msg_cerr(...) print(MSG_ERROR, __VA_ARGS__) /* chip errors */ @@ -243,6 +244,9 @@ int print(int type, const char *fmt, ...) __attribute__((format(printf, 2, 3))); #define msg_gdbg(...) print(MSG_DEBUG, __VA_ARGS__) /* general debug */ #define msg_pdbg(...) print(MSG_DEBUG, __VA_ARGS__) /* programmer debug */ #define msg_cdbg(...) print(MSG_DEBUG, __VA_ARGS__) /* chip debug */ +#define msg_gdbg2(...) print(MSG_DEBUG2, __VA_ARGS__) /* general debug2 */ +#define msg_pdbg2(...) print(MSG_DEBUG2, __VA_ARGS__) /* programmer debug2 */ +#define msg_cdbg2(...) print(MSG_DEBUG2, __VA_ARGS__) /* chip debug2 */ #define msg_gspew(...) print(MSG_BARF, __VA_ARGS__) /* general debug barf */ #define msg_pspew(...) print(MSG_BARF, __VA_ARGS__) /* programmer debug barf */ #define msg_cspew(...) print(MSG_BARF, __VA_ARGS__) /* chip debug barf */ diff --git a/flashrom.8 b/flashrom.8 index bc5e0a5f..6556609c 100644 --- a/flashrom.8 +++ b/flashrom.8 @@ -77,8 +77,8 @@ Erase the flash ROM chip. .TP .B "\-V, \-\-verbose" More verbose output. This option can be supplied multiple times -(max. 2 times, i.e. -.BR \-VV ) +(max. 3 times, i.e. +.BR \-VVV ) for even more debug output. .TP .B "\-c, \-\-chip" -- cgit v1.2.3