Verbose probe output is split across multiple lines for some probe functions. This makes visual inspection and grepping a lot harder than necessary. Remove line breaks where appropriate.
Output of "flashrom -V" on various chipsets and programmers is appreciated.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net
Index: flashrom-verbose_probe_oneline/jedec.c =================================================================== --- flashrom-verbose_probe_oneline/jedec.c (Revision 655) +++ flashrom-verbose_probe_oneline/jedec.c (Arbeitskopie) @@ -99,7 +99,7 @@ probe_timing_enter = probe_timing_exit = 0; } else if (flash->probe_timing == TIMING_FIXME) { /* == _IGNORED */ printf_debug("Chip lacks correct probe timing information, " - "using default 10mS/40uS\n"); + "using default 10mS/40uS. "); probe_timing_enter = 10000; probe_timing_exit = 40; } else { Index: flashrom-verbose_probe_oneline/spi.c =================================================================== --- flashrom-verbose_probe_oneline/spi.c (Revision 655) +++ flashrom-verbose_probe_oneline/spi.c (Arbeitskopie) @@ -99,7 +99,7 @@ printf_debug("RDID returned"); for (i = 0; i < bytes; i++) printf_debug(" 0x%02x", readarr[i]); - printf_debug("\n"); + printf_debug(". "); return 0; }
@@ -177,12 +177,12 @@ return 0;
if (!oddparity(readarr[0])) - printf_debug("RDID byte 0 parity violation.\n"); + printf_debug("RDID byte 0 parity violation. ");
/* Check if this is a continuation vendor ID */ if (readarr[0] == 0x7f) { if (!oddparity(readarr[1])) - printf_debug("RDID byte 1 parity violation.\n"); + printf_debug("RDID byte 1 parity violation. "); id1 = (readarr[0] << 8) | readarr[1]; id2 = readarr[2]; if (bytes > 3) {