cfi_intel_pri_ext_t -> struct cfi_intel_pri_ext

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

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index 18499d34e069e7a5a59464c6540268f03739a7e8..89ddc404e4ecabb23348d4f88f8517024118fee9 100644 (file)
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -25,7 +25,7 @@
 #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
+struct cfi_flash_bank
 {
        working_area_t *write_algorithm;
 
@@ -34,16 +34,16 @@ typedef struct cfi_flash_bank_s
        int not_cfi;
        int probed;
 
-       u16 manufacturer;
-       u16 device_id;
+       uint16_t manufacturer;
+       uint16_t device_id;
 
        char qry[3];
 
        /* identification string */
-       u16 pri_id;
-       u16 pri_addr;
-       u16 alt_id;
-       u16 alt_addr;
+       uint16_t pri_id;
+       uint16_t pri_addr;
+       uint16_t alt_id;
+       uint16_t alt_addr;
 
        /* device-system interface */
        uint8_t vcc_min;
@@ -62,36 +62,36 @@ typedef struct cfi_flash_bank_s
        uint8_t status_poll_mask;
 
        /* flash geometry */
-       u32 dev_size;
-       u16 interface_desc;
-       u16 max_buf_write_size;
+       uint32_t dev_size;
+       uint16_t interface_desc;
+       uint16_t max_buf_write_size;
        uint8_t num_erase_regions;
-       u32 *erase_region_info;
+       uint32_t *erase_region_info;
 
        void *pri_ext;
        void *alt_ext;
-} cfi_flash_bank_t;
+};
 
 /* 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)
  */
-typedef struct cfi_intel_pri_ext_s
+struct cfi_intel_pri_ext
 {
        char pri[3];
        uint8_t major_version;
        uint8_t minor_version;
-       u32 feature_support;
+       uint32_t feature_support;
        uint8_t suspend_cmd_support;
-       u16 blk_status_reg_mask;
+       uint16_t blk_status_reg_mask;
        uint8_t vcc_optimal;
        uint8_t vpp_optimal;
        uint8_t num_protection_fields;
-       u16 prot_reg_addr;
+       uint16_t prot_reg_addr;
        uint8_t fact_prot_reg_size;
        uint8_t user_prot_reg_size;
        uint8_t extra[0];
-} cfi_intel_pri_ext_t;
+};
 
 /* Spansion primary extended query table as defined for and used by
  * the linux kernel cfi driver (as of 2.6.15)
@@ -113,8 +113,8 @@ typedef struct cfi_spansion_pri_ext_s
        uint8_t  VppMax;
        uint8_t  TopBottom;
        int _reversed_geometry;
-       u32 _unlock1;
-       u32 _unlock2;
+       uint32_t _unlock1;
+       uint32_t _unlock2;
 } cfi_spansion_pri_ext_t;
 
 /* Atmel primary extended query table as defined for and used by
@@ -138,14 +138,14 @@ enum {
 
 typedef struct cfi_unlock_addresses_s
 {
-       u32 unlock1;
-       u32 unlock2;
+       uint32_t unlock1;
+       uint32_t unlock2;
 } cfi_unlock_addresses_t;
 
 typedef struct cfi_fixup_s
 {
-       u16 mfr;
-       u16 id;
+       uint16_t mfr;
+       uint16_t id;
        void (*fixup)(flash_bank_t *flash, void *param);
        void *param;
 } cfi_fixup_t;