Michael Bruck - fix warnings.

[fw/openocd] / src / flash / cfi.h

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index fa53f0d81dfe2b77c5f2bfd78344c5e4c7369bee..8099c4ea6ff37711f6f10d38f26a6b8c48b0cac6 100644 (file)
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -25,23 +25,25 @@
 
 typedef struct cfi_flash_bank_s
 {
-       struct target_s *target;
        working_area_t *write_algorithm;
        working_area_t *erase_check_algorithm;
-       
+
        int x16_as_x8;
-       
+       int jedec_probe;
+       int not_cfi;
+       int probed;
+
        u16 manufacturer;
        u16 device_id;
-               
+
        char qry[3];
-       
+
        /* identification string */
        u16 pri_id;
        u16 pri_addr;
        u16 alt_id;
        u16 alt_addr;
-       
+
        /* device-system interface */
        u8 vcc_min;
        u8 vcc_max;
@@ -55,19 +57,19 @@ typedef struct cfi_flash_bank_s
        u8 buf_write_timeout_max;
        u8 block_erase_timeout_max;
        u8 chip_erase_timeout_max;
-       
+
        /* flash geometry */
        u8 dev_size;
        u16 interface_desc;
        u16 max_buf_write_size;
        u8 num_erase_regions;
        u32 *erase_region_info;
-       
+
        void *pri_ext;
        void *alt_ext;
 } cfi_flash_bank_t;
 
-/* Intel primary extended query table 
+/* Intel primary extended query table
  * as defined for the Advanced+ Boot Block Flash Memory (C3)
  * and used by the linux kernel cfi driver (as of 2.6.14)
  */
@@ -108,6 +110,8 @@ typedef struct cfi_spansion_pri_ext_s
        u8  VppMax;
        u8  TopBottom;
        int _reversed_geometry;
+       u32 _unlock1;
+       u32 _unlock2;
 } cfi_spansion_pri_ext_t;
 
 /* Atmel primary extended query table as defined for and used by
@@ -124,6 +128,17 @@ typedef struct cfi_atmel_pri_ext_s
        u8 page_mode;
 } cfi_atmel_pri_ext_t;
 
+enum {
+       CFI_UNLOCK_555_2AA,
+       CFI_UNLOCK_5555_2AAA,
+};
+
+typedef struct cfi_unlock_addresses_s
+{
+       u32 unlock1;
+       u32 unlock2;
+} cfi_unlock_addresses_t;
+
 typedef struct cfi_fixup_s
 {
        u16 mfr;
@@ -135,6 +150,7 @@ typedef struct cfi_fixup_s
 #define CFI_MFR_AMD            0x0001
 #define CFI_MFR_ATMEL  0x001F
 #define CFI_MFR_ST             0x0020  /* STMicroelectronics */
+#define CFI_MFR_SST            0x00BF
 
 #define CFI_MFR_ANY            0xffff
 #define CFI_ID_ANY             0xffff