diff options
| author | snelson <snelson@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2010-01-07 20:09:33 +0000 |
|---|---|---|
| committer | snelson <snelson@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2010-01-07 20:09:33 +0000 |
| commit | a81e1d071e3b27731c4bd39f686548bad697acfd (patch) | |
| tree | dc9a65386d79b74b9b6c79f5fbe9bb09b83effe0 | |
| parent | 8327cfe61e9f5d8a6e985baa8dd612e194a40d54 (diff) | |
| download | flashrom-a81e1d071e3b27731c4bd39f686548bad697acfd.tar.gz | |
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>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@835 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cli_classic.c | 2 | ||||
| -rw-r--r-- | flash.h | 19 |
3 files changed, 21 insertions, 2 deletions
@@ -48,7 +48,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39v080fa.o sharplhf00l04.o w29ee011.o \ 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 diff --git a/cli_classic.c b/cli_classic.c index df17486..d3e7a15 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -205,7 +205,7 @@ int cli_classic(int argc, char *argv[]) chip_to_probe = strdup(optarg); break; case 'V': - verbose = 1; + verbose++; break; case 'E': if (++operation_specified > 1) { @@ -504,6 +504,25 @@ int doit(struct flashchip *flash, int force, char *filename, int read_it, int wr #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[]); |