Refine -L output to include all programmer modules
Flashrom -L output did not contain a list of programmers nor were
all programmers listed. Fix it and mention at least the name of each
programmer. Wiki output is unchanged, and will need separate fixups.
Corresponding to flashrom svn r1199.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
diff --git a/cli_classic.c b/cli_classic.c
index 979a822..9b9b451 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -33,11 +33,6 @@
static void cli_classic_usage(const char *name)
{
- const char *pname;
- int pnamelen;
- int remaining = 0;
- enum programmer p;
-
printf("Usage: flashrom [-n] [-V] [-f] [-h|-R|-L|"
#if CONFIG_PRINT_WIKI == 1
"-z|"
@@ -83,32 +78,9 @@
"in wiki syntax\n"
#endif
" -p | --programmer <name>[:<param>] specify the programmer "
- "device");
+ "device\n");
- for (p = 0; p < PROGRAMMER_INVALID; p++) {
- pname = programmer_table[p].name;
- pnamelen = strlen(pname);
- if (remaining - pnamelen - 2 < 0) {
- printf("\n ");
- remaining = 43;
- } else {
- printf(" ");
- remaining--;
- }
- if (p == 0) {
- printf("(");
- remaining--;
- }
- printf("%s", pname);
- remaining -= pnamelen;
- if (p < PROGRAMMER_INVALID - 1) {
- printf(",");
- remaining--;
- } else {
- printf(")\n");
- }
- }
-
+ list_programmers_linebreak(37, 80, 1);
printf("\nYou can specify one of -h, -R, -L, "
#if CONFIG_PRINT_WIKI == 1
"-z, "