X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnon_cfi.h;h=44c92db4314182407d18781ee8dd0a626bb3dc39;hb=1765b103044179baa2d5036bb61710369ae59e70;hp=9944573ff8e6b9371309ce3d0d947e0c12b0d455;hpb=f876d5e9c769a288faa7fd14b7bf373363542aab;p=openocd.git

diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h
index 9944573ff8..44c92db431 100644
--- a/src/flash/non_cfi.h
+++ b/src/flash/non_cfi.h
@@ -22,20 +22,19 @@
 
 #include "flash.h"
 
-typedef struct non_cfi_s
+struct non_cfi
 {
 	uint16_t mfr;
 	uint16_t id;
 	uint16_t pri_id;
-	u32 dev_size;
+	uint32_t dev_size;
 	uint16_t interface_desc;
 	uint16_t max_buf_write_size;
 	uint8_t num_erase_regions;
-	u32 erase_region_info[6];
+	uint32_t erase_region_info[6];
 	uint8_t  status_poll_mask;
-} non_cfi_t;
+};
 
-extern non_cfi_t non_cfi_flashes[];
-extern void cfi_fixup_non_cfi(flash_bank_t *bank);
+void cfi_fixup_non_cfi(struct flash_bank *bank);
 
 #endif /* NON_CFI_H */