[flashrom] [commit] r1121 - trunk

[repository service]

Author: hailfinger
Date: Thu Jul 29 18:32:24 2010
New Revision: 1121
URL: http://flashrom.org/trac/coreboot/changeset/1121

Log:
The AAI code rewrite in r1052 introduced a bug: The writelen of AAI
continuation is 3 bytes, but the code incorrectly had 6 bytes there.
This causes all AAI writes (except the first two bytes of a chip) to
fail.
Thanks to den_m for reporting the bug and for testing the fix.

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/spi.h

Modified: trunk/spi.h
==============================================================================
--- trunk/spi.h	Thu Jul 29 18:24:09 2010	(r1120)
+++ trunk/spi.h	Thu Jul 29 18:32:24 2010	(r1121)
@@ -108,15 +108,15 @@
 /*      JEDEC_READ_INSIZE : any length */
 
 /* Write memory byte */
-#define JEDEC_BYTE_PROGRAM	0x02
+#define JEDEC_BYTE_PROGRAM		0x02
 #define JEDEC_BYTE_PROGRAM_OUTSIZE	0x05
 #define JEDEC_BYTE_PROGRAM_INSIZE	0x00
 
 /* Write AAI word (SST25VF080B) */
-#define JEDEC_AAI_WORD_PROGRAM	0xad
-#define JEDEC_AAI_WORD_PROGRAM_OUTSIZE	0x06
-#define JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE	0x06
-#define JEDEC_AAI_WORD_PROGRAM_INSIZE	0x00
+#define JEDEC_AAI_WORD_PROGRAM			0xad
+#define JEDEC_AAI_WORD_PROGRAM_OUTSIZE		0x06
+#define JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE	0x03
+#define JEDEC_AAI_WORD_PROGRAM_INSIZE		0x00
 
 /* Error codes */
 #define SPI_GENERIC_ERROR	-1