openocd: src: fix incorrect SPDX tags

[openocd.git] / src / flash / nor / cfi.h

diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h
index effa1d5c0d469f128be1e1c9ce1670b1e532ae54..f8ca290a53dc9b04adfe9693b58d4570aa7323c7 100644 (file)
--- a/src/flash/nor/cfi.h
+++ b/src/flash/nor/cfi.h
@@ -23,13 +23,13 @@
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
 
 struct cfi_flash_bank {
-       int x16_as_x8;
-       int jedec_probe;
-       int not_cfi;
-       int probed;
+       bool x16_as_x8;
+       bool jedec_probe;
+       bool not_cfi;
+       bool probed;
 
        enum target_endianness endianness;
-       int data_swap;
+       bool data_swap;
 
        uint16_t manufacturer;
        uint16_t device_id;
@@ -108,17 +108,17 @@ struct cfi_spansion_pri_ext {
        uint8_t  pri[3];
        uint8_t  major_version;
        uint8_t  minor_version;
-       uint8_t  SiliconRevision; /* bits 1-0: Address Sensitive Unlock */
-       uint8_t  EraseSuspend;
-       uint8_t  BlkProt;
-       uint8_t  TmpBlkUnprotect;
-       uint8_t  BlkProtUnprot;
-       uint8_t  SimultaneousOps;
-       uint8_t  BurstMode;
-       uint8_t  PageMode;
-       uint8_t  VppMin;
-       uint8_t  VppMax;
-       uint8_t  TopBottom;
+       uint8_t  silicon_revision; /* bits 1-0: Address Sensitive Unlock */
+       uint8_t  erase_suspend;
+       uint8_t  blk_prot;
+       uint8_t  tmp_blk_unprotected;
+       uint8_t  blk_prot_unprot;
+       uint8_t  simultaneous_ops;
+       uint8_t  burst_mode;
+       uint8_t  page_mode;
+       uint8_t  vpp_min;
+       uint8_t  vpp_max;
+       uint8_t  top_bottom;
        int _reversed_geometry;
        uint32_t _unlock1;
        uint32_t _unlock2;
@@ -160,7 +160,7 @@ int cfi_protect(struct flash_bank *bank, int set, unsigned int first,
 int cfi_probe(struct flash_bank *bank);
 int cfi_auto_probe(struct flash_bank *bank);
 int cfi_protect_check(struct flash_bank *bank);
-int cfi_get_info(struct flash_bank *bank, char *buf, int buf_size);
+int cfi_get_info(struct flash_bank *bank, struct command_invocation *cmd);
 int cfi_flash_bank_cmd(struct flash_bank *bank, unsigned int argc, const char **argv);
 
 uint32_t cfi_flash_address(struct flash_bank *bank, int sector, uint32_t offset);