Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
build: cleanup src/flash/nor directory
[openocd.git] / src / flash / nor / stmsmi.c
diff --git a/src/flash/nor/stmsmi.c b/src/flash/nor/stmsmi.c
index df8dbe757ce1aebb5ad2091c2935ae3fe4e1aef9..bf26a8eb53d1fb22356d20c4592f12a6593f3280 100644 (file)
--- a/src/flash/nor/stmsmi.c
+++ b/src/flash/nor/stmsmi.c
@@ -43,33 +43,33 @@
 #include <helper/time_support.h>
 
 #define SMI_READ_REG(a) (_SMI_READ_REG(a))
-#define _SMI_READ_REG(a)               \
-{                                      \
-       int __a;                        \
-       uint32_t __v;                   \
-                                       \
+#define _SMI_READ_REG(a)                       \
+{                                                                      \
+       int __a;                                                \
+       uint32_t __v;                                   \
+                                                                       \
        __a = target_read_u32(target, io_base + (a), &__v); \
-       if (__a != ERROR_OK)            \
-           return __a;                 \
-       __v;                            \
+       if (__a != ERROR_OK)                    \
+               return __a;                                     \
+       __v;                                                    \
 }
 
-#define SMI_WRITE_REG(a,v)             \
-{                                      \
-       int __r;                        \
-                                       \
+#define SMI_WRITE_REG(a, v)                    \
+{                                                                      \
+       int __r;                                                \
+                                                                       \
        __r = target_write_u32(target, io_base + (a), (v)); \
-       if (__r != ERROR_OK)            \
-           return __r;                 \
+       if (__r != ERROR_OK)                    \
+               return __r;                                     \
 }
 
-#define SMI_POLL_TFF(timeout)          \
-{                                      \
-       int __r;                        \
-                                       \
+#define SMI_POLL_TFF(timeout)          \
+{                                                                      \
+       int __r;                                                \
+                                                                       \
        __r = poll_tff(target, io_base, timeout); \
-       if (__r != ERROR_OK)            \
-           return __r;                 \
+       if (__r != ERROR_OK)                    \
+               return __r;                                     \
 }
 
 #define SMI_SET_SW_MODE()      SMI_WRITE_REG(SMI_CR1, \
@@ -117,8 +117,7 @@
 #define SMI_PROBE_TIMEOUT (100)
 #define SMI_MAX_TIMEOUT  (3000)
 
-struct stmsmi_flash_bank
-{
+struct stmsmi_flash_bank {
        int probed;
        uint32_t io_base;
        uint32_t bank_num;
@@ -202,16 +201,13 @@ FLASH_BANK_COMMAND_HANDLER(stmsmi_flash_bank_command)
 {
        struct stmsmi_flash_bank *stmsmi_info;
 
-       LOG_DEBUG("%s", __FUNCTION__);
+       LOG_DEBUG("%s", __func__);
 
        if (CMD_ARGC < 6)
-       {
-           return ERROR_COMMAND_SYNTAX_ERROR;
-       }
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        stmsmi_info = malloc(sizeof(struct stmsmi_flash_bank));
-       if (stmsmi_info == NULL)
-       {
+       if (stmsmi_info == NULL) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
@@ -279,17 +275,17 @@ static int wait_till_ready(struct flash_bank *bank, int timeout)
        int retval;
        long long endtime;
 
-    endtime = timeval_ms() + timeout;
-    do {
-        /* read flash status register */
-        retval = read_status_reg(bank, &status);
-        if (retval != ERROR_OK)
-            return retval;
+       endtime = timeval_ms() + timeout;
+       do {
+               /* read flash status register */
+               retval = read_status_reg(bank, &status);
+               if (retval != ERROR_OK)
+                       return retval;
 
                if ((status & SMI_WIP_BIT) == 0)
                        return ERROR_OK;
                alive_sleep(1);
-    } while (timeval_ms() < endtime);
+       } while (timeval_ms() < endtime);
 
        LOG_ERROR("timeout");
        return ERROR_FAIL;
@@ -324,8 +320,7 @@ static int smi_write_enable(struct flash_bank *bank)
                return retval;
 
        /* Check write enabled */
-       if ((status & SMI_WEL_BIT) == 0)
-       {
+       if ((status & SMI_WEL_BIT) == 0) {
                LOG_ERROR("Cannot enable write to flash. Status=0x%08" PRIx32, status);
                return ERROR_FAIL;
        }
@@ -391,37 +386,31 @@ static int stmsmi_erase(struct flash_bank *bank, int first, int last)
        int retval = ERROR_OK;
        int sector;
 
-       LOG_DEBUG("%s: from sector %d to sector %d", __FUNCTION__, first, last);
+       LOG_DEBUG("%s: from sector %d to sector %d", __func__, first, last);
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if ((first < 0) || (last < first) || (last >= bank->num_sectors))
-       {
+       if ((first < 0) || (last < first) || (last >= bank->num_sectors)) {
                LOG_ERROR("Flash sector invalid");
                return ERROR_FLASH_SECTOR_INVALID;
        }
 
-       if (!(stmsmi_info->probed))
-       {
+       if (!(stmsmi_info->probed)) {
                LOG_ERROR("Flash bank not probed");
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
 
-       for (sector = first; sector <= last; sector++)
-       {
-               if (bank->sectors[sector].is_protected)
-               {
+       for (sector = first; sector <= last; sector++) {
+               if (bank->sectors[sector].is_protected) {
                        LOG_ERROR("Flash sector %d protected", sector);
                        return ERROR_FAIL;
                }
        }
 
-       for (sector = first; sector <= last; sector++)
-       {
+       for (sector = first; sector <= last; sector++) {
                retval = smi_erase_sector(bank, sector);
                if (retval != ERROR_OK)
                        break;
@@ -452,7 +441,7 @@ static int smi_write_buffer(struct flash_bank *bank, uint8_t *buffer,
        int retval;
 
        LOG_DEBUG("%s: address=0x%08" PRIx32 " len=0x%08" PRIx32,
-               __FUNCTION__, address, len);
+                       __func__, address, len);
 
        retval = smi_write_enable(bank);
        if (retval != ERROR_OK)
@@ -479,30 +468,26 @@ static int stmsmi_write(struct flash_bank *bank, uint8_t *buffer,
        int retval = ERROR_OK;
 
        LOG_DEBUG("%s: offset=0x%08" PRIx32 " count=0x%08" PRIx32,
-               __FUNCTION__, offset, count);
+               __func__, offset, count);
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (offset + count > stmsmi_info->dev->size_in_bytes)
-       {
+       if (offset + count > stmsmi_info->dev->size_in_bytes) {
                LOG_WARNING("Write pasts end of flash. Extra data discarded.");
                count = stmsmi_info->dev->size_in_bytes - offset;
        }
 
        /* Check sector protection */
-       for (sector = 0; sector < bank->num_sectors; sector++)
-       {
+       for (sector = 0; sector < bank->num_sectors; sector++) {
                /* Start offset in or before this sector? */
                /* End offset in or behind this sector? */
-               if ( (offset <
+               if ((offset <
                                (bank->sectors[sector].offset + bank->sectors[sector].size))
                        && ((offset + count - 1) >= bank->sectors[sector].offset)
-                       && bank->sectors[sector].is_protected )
-               {
+                       && bank->sectors[sector].is_protected) {
                        LOG_ERROR("Flash sector %d protected", sector);
                        return ERROR_FAIL;
                }
@@ -511,8 +496,7 @@ static int stmsmi_write(struct flash_bank *bank, uint8_t *buffer,
        page_size = stmsmi_info->dev->pagesize;
 
        /* unaligned buffer head */
-       if (count > 0 && (offset & 3) != 0)
-       {
+       if (count > 0 && (offset & 3) != 0) {
                cur_count = 4 - (offset & 3);
                if (cur_count > count)
                        cur_count = count;
@@ -527,8 +511,7 @@ static int stmsmi_write(struct flash_bank *bank, uint8_t *buffer,
 
        page_offset = offset % page_size;
        /* central part, aligned words */
-       while (count >= 4)
-       {
+       while (count >= 4) {
                /* clip block at page boundary */
                if (page_offset + count > page_size)
                        cur_count = page_size - page_offset;
@@ -567,8 +550,7 @@ static int read_flash_id(struct flash_bank *bank, uint32_t *id)
        uint32_t io_base = stmsmi_info->io_base;
        int retval;
 
-       if (target->state != TARGET_HALTED)
-       {
+       if (target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
                return ERROR_TARGET_NOT_HALTED;
        }
@@ -614,18 +596,16 @@ static int stmsmi_probe(struct flash_bank *bank)
                free(bank->sectors);
        stmsmi_info->probed = 0;
 
-       for (target_device=target_devices ; target_device->name ; ++target_device)
+       for (target_device = target_devices ; target_device->name ; ++target_device)
                if (target_device->tap_idcode == target->tap->idcode)
                        break;
-       if (!target_device->name)
-       {
+       if (!target_device->name) {
                LOG_ERROR("Device ID 0x%" PRIx32 " is not known as SMI capable",
                                target->tap->idcode);
                return ERROR_FAIL;
        }
 
-       switch (bank->base - target_device->smi_base)
-       {
+       switch (bank->base - target_device->smi_base) {
                case 0:
                        stmsmi_info->bank_num = SMI_SEL_BANK0;
                        break;
@@ -661,8 +641,7 @@ static int stmsmi_probe(struct flash_bank *bank)
                        break;
                }
 
-       if (!stmsmi_info->dev)
-       {
+       if (!stmsmi_info->dev) {
                LOG_ERROR("Unknown flash device (ID 0x%08" PRIx32 ")", id);
                return ERROR_FAIL;
        }
@@ -677,14 +656,12 @@ static int stmsmi_probe(struct flash_bank *bank)
        bank->num_sectors =
                stmsmi_info->dev->size_in_bytes / stmsmi_info->dev->sectorsize;
        sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
-       if (sectors == NULL)
-       {
+       if (sectors == NULL) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
 
-       for (int sector = 0; sector < bank->num_sectors; sector++)
-       {
+       for (int sector = 0; sector < bank->num_sectors; sector++) {
                sectors[sector].offset = sector * stmsmi_info->dev->sectorsize;
                sectors[sector].size = stmsmi_info->dev->sectorsize;
                sectors[sector].is_erased = -1;
@@ -714,8 +691,7 @@ static int get_stmsmi_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        struct stmsmi_flash_bank *stmsmi_info = bank->driver_priv;
 
-       if (!(stmsmi_info->probed))
-       {
+       if (!(stmsmi_info->probed)) {
                snprintf(buf, buf_size,
                        "\nSMI flash bank not probed yet\n");
                return ERROR_OK;
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)