Author: snelson Date: 2010-01-07 21:09:33 +0100 (Thu, 07 Jan 2010) New Revision: 835
Modified: trunk/Makefile trunk/cli_classic.c trunk/flash.h Log: Converting fprintf(stderr), printf, and printf_debug into a common print interface for flashrom. It also changes so -VV will spit out highly verbose messages for debugging. This is a minimal patch to lessen impact a later patch will convert current printf messages to the new interface.
Signed-off-by: Sean Nelson audiohacked@gmail.com Acked-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-07 03:32:17 UTC (rev 834) +++ trunk/Makefile 2010-01-07 20:09:33 UTC (rev 835) @@ -48,7 +48,7 @@
LIB_OBJS = layout.o
-CLI_OBJS = flashrom.o cli_classic.o print.o +CLI_OBJS = flashrom.o cli_classic.o cli_output.o print.o
PROGRAMMER_OBJS = udelay.o programmer.o
Modified: trunk/cli_classic.c =================================================================== --- trunk/cli_classic.c 2010-01-07 03:32:17 UTC (rev 834) +++ trunk/cli_classic.c 2010-01-07 20:09:33 UTC (rev 835) @@ -205,7 +205,7 @@ chip_to_probe = strdup(optarg); break; case 'V': - verbose = 1; + verbose++; break; case 'E': if (++operation_specified > 1) {
Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-07 03:32:17 UTC (rev 834) +++ trunk/flash.h 2010-01-07 20:09:33 UTC (rev 835) @@ -504,6 +504,25 @@ #define OK 0 #define NT 1 /* Not tested */
+/* cli_output.c */ +int print(int type, const char *fmt, ...); +#define MSG_ERROR 0 +#define MSG_INFO 1 +#define MSG_DEBUG 2 +#define MSG_BARF 3 +#define msg_gerr(x) print(MSG_ERROR, x) /* general errors */ +#define msg_perr(x) print(MSG_ERROR, x) /* programmer errors */ +#define msg_cerr(x) print(MSG_ERROR, x) /* chip errors */ +#define msg_ginfo(x) print(MSG_INFO, x) /* general info */ +#define msg_pinfo(x) print(MSG_INFO, x) /* programmer info */ +#define msg_cinfo(x) print(MSG_INFO, x) /* chip info */ +#define msg_gdbg(x) print(MSG_DEBUG, x) /* general debug */ +#define msg_pdbg(x) print(MSG_DEBUG, x) /* programmer debug */ +#define msg_cdbg(x) print(MSG_DEBUG, x) /* chip debug */ +#define msg_gspew(x) print(MSG_BARF, x) /* general debug barf */ +#define msg_pspew(x) print(MSG_BARF, x) /* programmer debug barf */ +#define msg_cspew(x) print(MSG_BARF, x) /* chip debug barf */ + /* cli_classic.c */ int cli_classic(int argc, char *argv[]);