Flash, FRAM and EEPROM driver for STM32 QUAD-/OCTOSPI interface

[fw/openocd] / src / flash / nor / stmsmi.c

diff --git a/src/flash/nor/stmsmi.c b/src/flash/nor/stmsmi.c
index e63401e33a19fbe19e224778ccd3fe45c867779b..e73dd22f61faade1f5a1b3747dcd3db5e1a3b556 100644 (file)
--- a/src/flash/nor/stmsmi.c
+++ b/src/flash/nor/stmsmi.c
@@ -44,31 +44,31 @@
 #define SMI_READ_REG(a) (_SMI_READ_REG(a))
 #define _SMI_READ_REG(a)                       \
 {                                                                      \
-       int __a;                                                \
-       uint32_t __v;                                   \
+       int _ret;                                               \
+       uint32_t _value;                                \
                                                                        \
-       __a = target_read_u32(target, io_base + (a), &__v); \
-       if (__a != ERROR_OK)                    \
-               return __a;                                     \
-       __v;                                                    \
+       _ret = target_read_u32(target, io_base + (a), &_value); \
+       if (_ret != ERROR_OK)                   \
+               return _ret;                            \
+       _value;                                                 \
 }
 
 #define SMI_WRITE_REG(a, v)                    \
 {                                                                      \
-       int __r;                                                \
+       int _retval;                                    \
                                                                        \
-       __r = target_write_u32(target, io_base + (a), (v)); \
-       if (__r != ERROR_OK)                    \
-               return __r;                                     \
+       _retval = target_write_u32(target, io_base + (a), (v)); \
+       if (_retval != ERROR_OK)                \
+               return _retval;                         \
 }
 
 #define SMI_POLL_TFF(timeout)          \
 {                                                                      \
-       int __r;                                                \
+       int _retval;                                    \
                                                                        \
-       __r = poll_tff(target, io_base, timeout); \
-       if (__r != ERROR_OK)                    \
-               return __r;                                     \
+       _retval = poll_tff(target, io_base, timeout); \
+       if (_retval != ERROR_OK)                \
+               return _retval;                         \
 }
 
 #define SMI_SET_SW_MODE()      SMI_WRITE_REG(SMI_CR1, \
@@ -115,7 +115,7 @@
 #define SMI_MAX_TIMEOUT  (3000)
 
 struct stmsmi_flash_bank {
-       int probed;
+       bool probed;
        uint32_t io_base;
        uint32_t bank_num;
        const struct flash_device *dev;
@@ -151,7 +151,7 @@ FLASH_BANK_COMMAND_HANDLER(stmsmi_flash_bank_command)
        }
 
        bank->driver_priv = stmsmi_info;
-       stmsmi_info->probed = 0;
+       stmsmi_info->probed = false;
 
        return ERROR_OK;
 }
@@ -531,7 +531,7 @@ static int stmsmi_probe(struct flash_bank *bank)
 
        if (stmsmi_info->probed)
                free(bank->sectors);
-       stmsmi_info->probed = 0;
+       stmsmi_info->probed = false;
 
        for (target_device = target_devices ; target_device->name ; ++target_device)
                if (target_device->tap_idcode == target->tap->idcode)
@@ -614,7 +614,7 @@ static int stmsmi_probe(struct flash_bank *bank)
        }
 
        bank->sectors = sectors;
-       stmsmi_info->probed = 1;
+       stmsmi_info->probed = true;
        return ERROR_OK;
 }