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 ae6ae28ef8695fa1869b5b1a8c5239c68469d775..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;