X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fcfi.h;h=d55fd34ef5f2335a0f18615d6979c19954ec1603;hb=2221a037447b61b8a9db500ba997e61dbe874d61;hp=18499d34e069e7a5a59464c6540268f03739a7e8;hpb=310be8a838c9db6b67bc4d6d7d3c7ff41b32af4c;p=openocd.git

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index 18499d34e0..d55fd34ef5 100644
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -25,25 +25,25 @@
 #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;
+	struct working_area *write_algorithm;
 
 	int x16_as_x8;
 	int jedec_probe;
 	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,41 +62,41 @@ 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)
  */
-typedef struct cfi_spansion_pri_ext_s
+struct cfi_spansion_pri_ext
 {
 	uint8_t  pri[3];
 	uint8_t  major_version;
@@ -113,14 +113,14 @@ typedef struct cfi_spansion_pri_ext_s
 	uint8_t  VppMax;
 	uint8_t  TopBottom;
 	int _reversed_geometry;
-	u32 _unlock1;
-	u32 _unlock2;
-} cfi_spansion_pri_ext_t;
+	uint32_t _unlock1;
+	uint32_t _unlock2;
+};
 
 /* Atmel primary extended query table as defined for and used by
  * the linux kernel cfi driver (as of 2.6.20+)
  */
-typedef struct cfi_atmel_pri_ext_s
+struct cfi_atmel_pri_ext
 {
 	uint8_t pri[3];
 	uint8_t major_version;
@@ -129,26 +129,26 @@ typedef struct cfi_atmel_pri_ext_s
 	uint8_t bottom_boot;
 	uint8_t burst_mode;
 	uint8_t page_mode;
-} cfi_atmel_pri_ext_t;
+};
 
 enum {
 	CFI_UNLOCK_555_2AA,
 	CFI_UNLOCK_5555_2AAA,
 };
 
-typedef struct cfi_unlock_addresses_s
+struct cfi_unlock_addresses
 {
-	u32 unlock1;
-	u32 unlock2;
-} cfi_unlock_addresses_t;
+	uint32_t unlock1;
+	uint32_t unlock2;
+};
 
-typedef struct cfi_fixup_s
+struct cfi_fixup
 {
-	u16 mfr;
-	u16 id;
-	void (*fixup)(flash_bank_t *flash, void *param);
+	uint16_t mfr;
+	uint16_t id;
+	void (*fixup)(struct flash_bank *flash, void *param);
 	void *param;
-} cfi_fixup_t;
+};
 
 #define CFI_MFR_AMD		0x0001
 #define CFI_MFR_FUJITSU	0x0004