flash_bank_t -> struct flash_bank

[fw/openocd] / src / flash / non_cfi.h

diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h
index f068e10fbe879144f63d6c5557a32558245798ea..44c92db4314182407d18781ee8dd0a626bb3dc39 100644 (file)
--- 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
 {
-       u16 mfr;
-       u16 id;
-       u16 pri_id;
-       u32 dev_size;
-       u16 interface_desc;
-       u16 max_buf_write_size;
+       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;
-       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 */