X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fcfi.h;h=dc43dd18bda7523a87645ae287f95f65097a06e7;hp=ade63185e78563da6aa9c6d343f02911edf58c34;hb=55ebb067d1214b4136343ac6356ad15169a631f2;hpb=577972a51d9b3655cd14d5ce176995b09909933e

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index ade63185e7..dc43dd18bd 100644
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -23,10 +23,12 @@
 #include "flash.h"
 #include "target.h"
 
+#define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
+#define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
+
 typedef struct cfi_flash_bank_s
 {
 	working_area_t *write_algorithm;
-	
 
 	int x16_as_x8;
 	int jedec_probe;
@@ -58,8 +60,10 @@ typedef struct cfi_flash_bank_s
 	u8 block_erase_timeout_max;
 	u8 chip_erase_timeout_max;
 
+	u8 status_poll_mask;
+
 	/* flash geometry */
-	u8 dev_size;
+	u32 dev_size;
 	u16 interface_desc;
 	u16 max_buf_write_size;
 	u8 num_erase_regions;
@@ -148,11 +152,12 @@ typedef struct cfi_fixup_s
 } cfi_fixup_t;
 
 #define CFI_MFR_AMD		0x0001
-#define CFI_MFR_FUJITSU		0x0004
+#define CFI_MFR_FUJITSU	0x0004
 #define CFI_MFR_ATMEL	0x001F
 #define CFI_MFR_ST		0x0020	/* STMicroelectronics */
-#define CFI_MFR_AMIC		0x0037
+#define CFI_MFR_AMIC	0x0037
 #define CFI_MFR_SST		0x00BF
+#define CFI_MFR_MX		0x00C2
 
 #define CFI_MFR_ANY		0xffff
 #define CFI_ID_ANY		0xffff