[flashrom] [commit] r1893 - trunk

[repository service]

Author: stefanct
Date: Tue Jun 23 01:59:15 2015
New Revision: 1893
URL: http://flashrom.org/trac/flashrom/changeset/1893

Log:
spi25: ignore 0x00 as a manufacturer id in the generic match.

Saying that manufacturer id 0x00 is an "unknown SPI chip"
just confuses people with external programmers without a
proper connection to a chip and makes them think flashrom
doesn't support the chip they're trying to use.
Also causes unnecessary -c requirement with a multiple-slot
(FWH/LPC and SPI) serprog device i was testing.

Signed-off-by: Urja Rannikko <urjaman at gmail.com>
Acked-by: Stefan Tauner <stefan.tauner at alumni.tuwien.ac.at>

Modified:
   trunk/spi25.c

Modified: trunk/spi25.c
==============================================================================
--- trunk/spi25.c	Sat Jun 20 13:53:10 2015	(r1892)
+++ trunk/spi25.c	Tue Jun 23 01:59:15 2015	(r1893)
@@ -156,7 +156,7 @@
 		return 1;
 
 	/* Test if there is any vendor ID. */
-	if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff)
+	if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00)
 		return 1;
 
 	return 0;
@@ -212,7 +212,7 @@
 		return 1;
 
 	/* Test if there is any vendor ID. */
-	if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff)
+	if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00)
 		return 1;
 
 	return 0;