X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fcfi.h;h=deca9163d922494f9ded0e0f43eb6f15dafde170;hb=46fc1d57ac9462fd788277609707a379c7a406cb;hp=565f8ef17fdada54d01e2118df9067ef681f32b4;hpb=2ded74115d2b1dcea5a1c1a327a0da159cf1b962;p=openocd.git

diff --git a/src/flash/cfi.h b/src/flash/cfi.h
index 565f8ef17f..deca9163d9 100644
--- a/src/flash/cfi.h
+++ b/src/flash/cfi.h
@@ -27,7 +27,7 @@
 
 struct cfi_flash_bank
 {
-	working_area_t *write_algorithm;
+	struct working_area *write_algorithm;
 
 	int x16_as_x8;
 	int jedec_probe;
@@ -96,7 +96,7 @@ struct cfi_intel_pri_ext
 /* 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;
@@ -115,7 +115,7 @@ typedef struct cfi_spansion_pri_ext_s
 	int _reversed_geometry;
 	uint32_t _unlock1;
 	uint32_t _unlock2;
-} cfi_spansion_pri_ext_t;
+};
 
 /* Atmel primary extended query table as defined for and used by
  * the linux kernel cfi driver (as of 2.6.20+)
@@ -136,19 +136,19 @@ enum {
 	CFI_UNLOCK_5555_2AAA,
 };
 
-typedef struct cfi_unlock_addresses_s
+struct cfi_unlock_addresses
 {
 	uint32_t unlock1;
 	uint32_t unlock2;
-} cfi_unlock_addresses_t;
+};
 
-typedef struct cfi_fixup_s
+struct cfi_fixup
 {
 	uint16_t mfr;
 	uint16_t id;
 	void (*fixup)(flash_bank_t *flash, void *param);
 	void *param;
-} cfi_fixup_t;
+};
 
 #define CFI_MFR_AMD		0x0001
 #define CFI_MFR_FUJITSU	0x0004