Transform 'u16' to 'uint16_t'

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

diff --git a/src/flash/non_cfi.h b/src/flash/non_cfi.h
index e91b209828186d8f5d6da16b744bd9882712c5ed..9944573ff8e6b9371309ce3d0d947e0c12b0d455 100644 (file)
--- a/src/flash/non_cfi.h
+++ b/src/flash/non_cfi.h
@@ -20,22 +20,22 @@
 #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;
-       u8 dev_size;
-       u16 interface_desc;
-       u16 max_buf_write_size;
-       u8 num_erase_regions;
+       uint16_t mfr;
+       uint16_t id;
+       uint16_t pri_id;
+       u32 dev_size;
+       uint16_t interface_desc;
+       uint16_t max_buf_write_size;
+       uint8_t num_erase_regions;
        u32 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 *param);
+extern void cfi_fixup_non_cfi(flash_bank_t *bank);
 
 #endif /* NON_CFI_H */
-