diff --git a/Makefile b/Makefile index a0bf1ec..8a9c13f 100644 --- a/Makefile +++ b/Makefile @@ -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) { diff --git a/cli_output.c b/cli_output.c new file mode 100644 index 0000000..2ced043 --- /dev/null +++ b/cli_output.c @@ -0,0 +1,51 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 Sean Nelson + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include "flash.h" + +int print(int type, const char *fmt, ...) +{ + va_list ap; + int ret; + FILE *output_type; + + switch (type) + { + case MSG_ERROR: + output_type = stderr; + break; + case MSG_BARF: + if (verbose < 2) return 0; + case MSG_DEBUG: + if (verbose < 1) return 0; + case MSG_INFO: + default: + output_type = stdout; + break; + } + + va_start(ap, fmt); + ret = vfprintf(output_type, fmt, ap); + va_end(ap); + return ret; +} + diff --git a/flash.h b/flash.h index 648dc83..a4fb0d7 100644 --- a/flash.h +++ b/flash.h @@ -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) +#define msg_perr(x) print(MSG_ERROR, x) +#define msg_cerr(x) print(MSG_ERROR, x) +#define msg_ginfo(x) print(MSG_INFO, x) +#define msg_pinfo(x) print(MSG_INFO, x) +#define msg_cinfo(x) print(MSG_INFO, x) +#define msg_gdbg(x) print(MSG_DEBUG, x) +#define msg_pdbg(x) print(MSG_DEBUG, x) +#define msg_cdbg(x) print(MSG_DEBUG, x) +#define msg_gspw(x) print(MSG_BARF, x) +#define msg_pspw(x) print(MSG_BARF, x) +#define msg_cspw(x) print(MSG_BARF, x) + /* cli_classic.c */ int cli_classic(int argc, char *argv[]);