Eliminate MixedCaps symbol from public JTAG TAP API:

[openocd] / src / flash / cfi.h

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index 3e3e6fe526c47da1048ccc9fa842e07fb45b7342..49fbad49777b192a1f51be369a9b8f2fa4b2d367 100644 (file)
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -21,12 +21,13 @@
 #define CFI_H
 
 #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 +59,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,10 +151,10 @@ 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