X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnon_cfi.h;h=14a6df72d7444acdb429c70a95733a448312c8e8;hp=e4b33d403d3274958de06d83fe763b47d1d6c2e3;hb=57c5c5f46304a785092874a7dc0f6abc84794cc3;hpb=55ebb067d1214b4136343ac6356ad15169a631f2

diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h
index e4b33d403d..14a6df72d7 100644
--- a/src/flash/non_cfi.h
+++ b/src/flash/non_cfi.h
@@ -20,22 +20,21 @@
 #ifndef NON_CFI_H
 #define NON_CFI_H
 
-#include "types.h"
+#include "flash.h"
 
 typedef struct non_cfi_s
 {
-	u16 mfr;
-	u16 id;
-	u16 pri_id;
-	u32 dev_size;
-	u16 interface_desc;
-	u16 max_buf_write_size;
-	u8 num_erase_regions;
-	u32 erase_region_info[6];
-	u8  status_poll_mask;
+	uint16_t mfr;
+	uint16_t id;
+	uint16_t pri_id;
+	uint32_t dev_size;
+	uint16_t interface_desc;
+	uint16_t max_buf_write_size;
+	uint8_t num_erase_regions;
+	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(flash_bank_t *bank);
 
 #endif /* NON_CFI_H */