cmd: add missing usage var

[openocd.git] / src / flash / nor / cfi.h

diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h
index fa717dc815ccdb50c5d6f1c603426a3cc149083f..a57b0ddc49be9c3481ebdca08b87ea281dafecdc 100644 (file)
--- a/src/flash/nor/cfi.h
+++ b/src/flash/nor/cfi.h
@@ -35,7 +35,7 @@ struct cfi_flash_bank
        uint16_t manufacturer;
        uint16_t device_id;
 
-       char qry[3];
+       uint8_t qry[3];
 
        /* identification string */
        uint16_t pri_id;
@@ -68,6 +68,12 @@ struct cfi_flash_bank
 
        void *pri_ext;
        void *alt_ext;
+
+       /* calculated timeouts */
+       unsigned word_write_timeout;
+       unsigned buf_write_timeout;
+       unsigned block_erase_timeout;
+       unsigned chip_erase_timeout;
 };
 
 /* Intel primary extended query table
@@ -76,7 +82,7 @@ struct cfi_flash_bank
  */
 struct cfi_intel_pri_ext
 {
-       char pri[3];
+       uint8_t pri[3];
        uint8_t major_version;
        uint8_t minor_version;
        uint32_t feature_support;
@@ -144,7 +150,7 @@ struct cfi_fixup
 {
        uint16_t mfr;
        uint16_t id;
-       void (*fixup)(struct flash_bank *flash, void *param);
+       void (*fixup)(struct flash_bank *bank, void *param);
        void *param;
 };
 
@@ -155,6 +161,7 @@ struct cfi_fixup
 #define CFI_MFR_AMIC   0x0037
 #define CFI_MFR_SST            0x00BF
 #define CFI_MFR_MX             0x00C2
+#define CFI_MFR_EON            0x007F
 
 #define CFI_MFR_ANY            0xffff
 #define CFI_ID_ANY             0xffff