[flashrom] [commit] r1341 - trunk

[repository service]

Author: hailfinger
Date: Sat Jun 18 00:38:53 2011
New Revision: 1341
URL: http://flashrom.org/trac/flashrom/changeset/1341

Log:
Do not display skipped probe messsages in verbose mode.
They are still visible in spew mode (-VV).

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>

Modified:
   trunk/flashrom.c

Modified: trunk/flashrom.c
==============================================================================
--- trunk/flashrom.c	Fri Jun 17 23:25:48 2011	(r1340)
+++ trunk/flashrom.c	Sat Jun 18 00:38:53 2011	(r1341)
@@ -1124,24 +1124,25 @@
 	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, %d kB: skipped. ",
+			         flash->vendor, flash->name, flash->total_size);
 			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;
 		}