[flashrom] [PATCH] Shut up skipped probes

[Carl-Daniel Hailfinger]

Now that the bus matching code has been tested extensively, it does not
make sense at all to print skipped probes in verbose mode. They are
still visible in spew mode (-VV) if anyone cares, but even there the
chip size won't be mentioned.

Old verbose output:
Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMIC A25L05PT, 64 kB: skipped.
Probing for AMIC A25L05PU, 64 kB: skipped.
[...]
Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0xff
Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0xff

New verbose output:
Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff

New spew output:
Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMIC A25L05PT: skipped. Host bus type Parallel and chip bus type SPI are incompatible.
Probing for AMIC A25L05PU: skipped. Host bus type Parallel and chip bus type SPI are incompatible.
[...]
Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff
Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff



Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Index: flashrom-silence_skip/flashrom.c
===================================================================
--- flashrom-silence_skip/flashrom.c	(Revision 1338)
+++ flashrom-silence_skip/flashrom.c	(Arbeitskopie)
@@ -1124,26 +1124,27 @@
 	for (flash = flashchips + startchip; flash && flash->name; flash++) {
 		if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0)
 			continue;
-		msg_gdbg("Probing for %s %s, %d kB: ",
-			     flash->vendor, flash->name, flash->total_size);
-		if (!flash->probe && !force) {
-			msg_gdbg("failed! flashrom has no probe function for "
-				 "this flash chip.\n");
-			continue;
-		}
 		buses_common = buses_supported & flash->bustype;
 		if (!buses_common) {
+			msg_gspew("Probing for %s %s: skipped. ",
+			         flash->vendor, flash->name);
 			tmp = flashbuses_to_text(buses_supported);
-			msg_gdbg("skipped.");
-			msg_gspew(" Host bus type %s ", tmp);
+			msg_gspew("Host bus type %s ", tmp);
 			free(tmp);
 			tmp = flashbuses_to_text(flash->bustype);
 			msg_gspew("and chip bus type %s are incompatible.",
 				  tmp);
 			free(tmp);
-			msg_gdbg("\n");
+			msg_gspew("\n");
 			continue;
 		}
+		msg_gdbg("Probing for %s %s, %d kB: ",
+			     flash->vendor, flash->name, flash->total_size);
+		if (!flash->probe && !force) {
+			msg_gdbg("failed! flashrom has no probe function for "
+				 "this flash chip.\n");
+			continue;
+		}
 
 		size = flash->total_size * 1024;
 		check_max_decode(buses_common, size);


-- 
http://www.hailfinger.org/