[PATCH] Fix AAI code

Hi again! Sorry, but my mail'll be greater than simply 'acking'

r1060 with your patch not working

Index: flashrom-spi_aai_outsize_fix/spi.h
===================================================================
--- flashrom-spi_aai_outsize_fix/spi.h    (Revision 1058)
+++ flashrom-spi_aai_outsize_fix/spi.h    (Arbeitskopie)
@@ -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

r1060 with above patch and following patch also not working:

Index: spi25.c
===================================================================
--- spi25.c    (revision 1060)
+++ spi25.c    (working copy)
@@ -169,6 +169,7 @@

int probe_spi_rdid(struct flashchip *flash)
 {
+    spi_write_disable();
     return probe_spi_rdid_generic(flash, 3);
 }

but r1060 with all above patches and following patch working:

Index: flashchips.c
===================================================================
--- flashchips.c    (revision 1060)
+++ flashchips.c    (working copy)
@@ -1392,7 +1392,7 @@
                 .block_erase = spi_block_erase_c7,
             }
         },
-        .write        = spi_aai_write,
+        .write        = spi_chip_write_1,//spi_aai_write,
         .read        = read_memmapped,
     },