Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
10ms timeout check on cp15 read/write
[openocd.git] / src / flash / pic32mx.c
diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index 7009995aa737f7e51ce632bb72c19e9462050d40..48ba38c323e5027adf8a17d5cb914d69bccf8e13 100644 (file)
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -148,11 +148,11 @@ static uint32_t pic32mx_wait_status_busy(flash_bank_t *bank, int timeout)
        /* wait for busy to clear */
        while (((status = pic32mx_get_flash_status(bank)) & NVMCON_NVMWR) && (timeout-- > 0))
        {
-               LOG_DEBUG("status: 0x%" PRIx32, status );
+               LOG_DEBUG("status: 0x%" PRIx32, status);
                alive_sleep(1);
        }
        if (timeout <= 0)
-               LOG_DEBUG("timeout: status: 0x%" PRIx32, status );
+               LOG_DEBUG("timeout: status: 0x%" PRIx32, status);
 
        return status;
 }
@@ -162,7 +162,7 @@ static int pic32mx_nvm_exec(struct flash_bank_s *bank, uint32_t op, uint32_t tim
        target_t *target = bank->target;
        uint32_t status;
 
-       target_write_u32(target, PIC32MX_NVMCON, NVMCON_NVMWREN|op);
+       target_write_u32(target, PIC32MX_NVMCON, NVMCON_NVMWREN | op);
 
        /* unlock flash registers */
        target_write_u32(target, PIC32MX_NVMKEY, NVMKEY1);
@@ -229,9 +229,9 @@ static int pic32mx_erase(struct flash_bank_s *bank, int first, int last)
        {
                LOG_DEBUG("Erasing entire program flash");
                status = pic32mx_nvm_exec(bank, NVMCON_OP_PFM_ERASE, 50);
-               if ( status & NVMCON_NVMERR )
+               if (status & NVMCON_NVMERR)
                        return ERROR_FLASH_OPERATION_FAILED;
-               if ( status & NVMCON_LVDERR )
+               if (status & NVMCON_LVDERR)
                        return ERROR_FLASH_OPERATION_FAILED;
                return ERROR_OK;
        }
@@ -245,9 +245,9 @@ static int pic32mx_erase(struct flash_bank_s *bank, int first, int last)
 
                status = pic32mx_nvm_exec(bank, NVMCON_OP_PAGE_ERASE, 10);
 
-               if ( status & NVMCON_NVMERR )
+               if (status & NVMCON_NVMERR)
                        return ERROR_FLASH_OPERATION_FAILED;
-               if ( status & NVMCON_LVDERR )
+               if (status & NVMCON_LVDERR)
                        return ERROR_FLASH_OPERATION_FAILED;
                bank->sectors[i].is_erased = 1;
        }
@@ -313,7 +313,7 @@ static int pic32mx_protect(struct flash_bank_s *bank, int set, int first, int la
                        reg = (i / pic32mx_info->ppage_size) / 8;
                        bit = (i / pic32mx_info->ppage_size) - (reg * 8);
 
-                       if ( set )
+                       if (set)
                                prot_reg[reg] &= ~(1 << bit);
                        else
                                prot_reg[reg] |= (1 << bit);
@@ -327,7 +327,7 @@ static int pic32mx_protect(struct flash_bank_s *bank, int set, int first, int la
                        reg = (i / pic32mx_info->ppage_size) / 8;
                        bit = (i / pic32mx_info->ppage_size) - (reg * 8);
 
-                       if ( set )
+                       if (set)
                                prot_reg[reg] &= ~(1 << bit);
                        else
                                prot_reg[reg] |= (1 << bit);
@@ -388,7 +388,7 @@ static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint3
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        };
 
-       if ((retval=target_write_buffer(target, pic32mx_info->write_algorithm->address, sizeof(pic32mx_flash_write_code), pic32mx_flash_write_code)) != ERROR_OK)
+       if ((retval = target_write_buffer(target, pic32mx_info->write_algorithm->address, sizeof(pic32mx_flash_write_code), pic32mx_flash_write_code)) != ERROR_OK)
                return retval;
 #endif
 
@@ -434,13 +434,13 @@ static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint3
                }
 #endif
                status = pic32mx_write_row(bank, address, source->address);
-               if ( status & NVMCON_NVMERR ) {
-                       LOG_ERROR("Flash write error NVMERR (status=0x%08" PRIx32 ")", status);
+               if (status & NVMCON_NVMERR) {
+                       LOG_ERROR("Flash write error NVMERR (status = 0x%08" PRIx32 ")", status);
                        retval = ERROR_FLASH_OPERATION_FAILED;
                        break;
                }
-               if ( status & NVMCON_LVDERR ) {
-                       LOG_ERROR("Flash write error LVDERR (status=0x%08" PRIx32 ")", status);
+               if (status & NVMCON_LVDERR) {
+                       LOG_ERROR("Flash write error LVDERR (status = 0x%08" PRIx32 ")", status);
                        retval = ERROR_FLASH_OPERATION_FAILED;
                        break;
                }
@@ -458,13 +458,13 @@ static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint3
                memcpy(&value, buffer, sizeof(uint32_t));
 
                uint32_t status = pic32mx_write_word(bank, address, value);
-               if ( status & NVMCON_NVMERR ) {
-                       LOG_ERROR("Flash write error NVMERR (status=0x%08" PRIx32 ")", status);
+               if (status & NVMCON_NVMERR) {
+                       LOG_ERROR("Flash write error NVMERR (status = 0x%08" PRIx32 ")", status);
                        retval = ERROR_FLASH_OPERATION_FAILED;
                        break;
                }
-               if ( status & NVMCON_LVDERR ) {
-                       LOG_ERROR("Flash write error LVDERR (status=0x%08" PRIx32 ")", status);
+               if (status & NVMCON_LVDERR) {
+                       LOG_ERROR("Flash write error LVDERR (status = 0x%08" PRIx32 ")", status);
                        retval = ERROR_FLASH_OPERATION_FAILED;
                        break;
                }
@@ -564,9 +564,9 @@ static int pic32mx_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t of
                memcpy(&value, buffer + bytes_written, sizeof(uint32_t));
 
                status = pic32mx_write_word(bank, address, value);
-               if ( status & NVMCON_NVMERR )
+               if (status & NVMCON_NVMERR)
                        return ERROR_FLASH_OPERATION_FAILED;
-               if ( status & NVMCON_LVDERR )
+               if (status & NVMCON_LVDERR)
                        return ERROR_FLASH_OPERATION_FAILED;
 
                bytes_written += 4;
@@ -580,9 +580,9 @@ static int pic32mx_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t of
                memcpy(&value, buffer + bytes_written, bytes_remaining);
 
                status = pic32mx_write_word(bank, address, value);
-               if ( status & NVMCON_NVMERR )
+               if (status & NVMCON_NVMERR)
                        return ERROR_FLASH_OPERATION_FAILED;
-               if ( status & NVMCON_LVDERR )
+               if (status & NVMCON_LVDERR)
                        return ERROR_FLASH_OPERATION_FAILED;
        }
 
@@ -603,14 +603,14 @@ static int pic32mx_probe(struct flash_bank_s *bank)
        pic32mx_info->probed = 0;
 
        device_id = ejtag_info->idcode;
-       LOG_INFO( "device id = 0x%08" PRIx32 " (manuf 0x%03x dev 0x%02x, ver 0x%03x)", 
+       LOG_INFO("device id = 0x%08" PRIx32 " (manuf 0x%03x dev 0x%02x, ver 0x%03x)",
                          device_id,
-                         (unsigned)((device_id >> 1)&0x7ff), 
-                         (unsigned)((device_id >> 12)&0xff), 
-                         (unsigned)((device_id >> 20)&0xfff) );
+                         (unsigned)((device_id >> 1)&0x7ff),
+                         (unsigned)((device_id >> 12)&0xff),
+                         (unsigned)((device_id >> 20)&0xfff));
 
        if (((device_id >> 1)&0x7ff) != PIC32MX_MANUF_ID) {
-               LOG_WARNING( "Cannot identify target as a PIC32MX family." );
+               LOG_WARNING("Cannot identify target as a PIC32MX family.");
                return ERROR_FLASH_OPERATION_FAILED;
        }
 
@@ -620,13 +620,13 @@ static int pic32mx_probe(struct flash_bank_s *bank)
                num_pages = 12;
        } else {
                /* 0xBD000000: Program flash size varies with device */
-               for (i=0; pic32mx_devs[i].name != NULL; i++)
+               for (i = 0; pic32mx_devs[i].name != NULL; i++)
                        if (pic32mx_devs[i].devid == ((device_id >> 12) & 0xff)) {
                                num_pages = pic32mx_devs[i].pfm_size;
                                break;
                        }
                if (pic32mx_devs[i].name == NULL) {
-                       LOG_WARNING( "Cannot identify target as a PIC32MX family." );
+                       LOG_WARNING("Cannot identify target as a PIC32MX family.");
                        return ERROR_FLASH_OPERATION_FAILED;
                }
        }
@@ -646,7 +646,7 @@ static int pic32mx_probe(struct flash_bank_s *bank)
        }
 #endif
 
-       LOG_INFO( "flash size = %dkbytes", num_pages );
+       LOG_INFO("flash size = %dkbytes", num_pages);
 
        /* calculate numbers of pages */
        num_pages /= (page_size / 1024);
@@ -698,13 +698,13 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size)
        device_id = ejtag_info->idcode;
 
        if (((device_id >> 1)&0x7ff) != PIC32MX_MANUF_ID) {
-               snprintf(buf, buf_size, 
-                                "Cannot identify target as a PIC32MX family (manufacturer 0x%03d != 0x%03d)\n", 
-                                (unsigned)((device_id >> 1)&0x7ff), 
+               snprintf(buf, buf_size,
+                                "Cannot identify target as a PIC32MX family (manufacturer 0x%03d != 0x%03d)\n",
+                                (unsigned)((device_id >> 1)&0x7ff),
                                 PIC32MX_MANUF_ID);
                return ERROR_FLASH_OPERATION_FAILED;
        }
-       for (i=0; pic32mx_devs[i].name != NULL; i++)
+       for (i = 0; pic32mx_devs[i].name != NULL; i++)
                if (pic32mx_devs[i].devid == ((device_id >> 12) & 0xff)) {
                        printed = snprintf(buf, buf_size, "PIC32MX%s", pic32mx_devs[i].name);
                        break;
@@ -715,7 +715,7 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size)
        }
        buf += printed;
        buf_size -= printed;
-       printed = snprintf(buf, buf_size, "  Ver: 0x%03x", 
+       printed = snprintf(buf, buf_size, "  Ver: 0x%03x",
                                           (unsigned)((device_id >> 20)&0xfff));
 
        return ERROR_OK;
@@ -841,19 +841,19 @@ static int pic32mx_chip_erase(struct flash_bank_s *bank)
 
        /* chip erase flash memory */
        target_write_u32(target, PIC32MX_FLASH_CR, FLASH_MER);
-       target_write_u32(target, PIC32MX_FLASH_CR, FLASH_MER|FLASH_STRT);
+       target_write_u32(target, PIC32MX_FLASH_CR, FLASH_MER | FLASH_STRT);
 
        status = pic32mx_wait_status_busy(bank, 10);
 
        target_write_u32(target, PIC32MX_FLASH_CR, FLASH_LOCK);
 
-       if ( status & FLASH_WRPRTERR )
+       if (status & FLASH_WRPRTERR)
        {
                LOG_ERROR("pic32mx device protected");
                return ERROR_OK;
        }
 
-       if ( status & FLASH_PGERR )
+       if (status & FLASH_PGERR)
        {
                LOG_ERROR("pic32mx device programming failed");
                return ERROR_OK;
@@ -923,7 +923,7 @@ static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, ch
                command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[2]);
                return ERROR_OK;
        }
-       if (address < bank->base || address >= (bank->base+bank->size))
+       if (address < bank->base || address >= (bank->base + bank->size))
        {
                command_print(cmd_ctx, "flash address '%s' is out of bounds", args[0]);
                return ERROR_OK;
@@ -931,15 +931,15 @@ static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, ch
 
        res = ERROR_OK;
        status = pic32mx_write_word(bank, address, value);
-       if ( status & NVMCON_NVMERR )
+       if (status & NVMCON_NVMERR)
                res = ERROR_FLASH_OPERATION_FAILED;
-       if ( status & NVMCON_LVDERR )
+       if (status & NVMCON_LVDERR)
                res = ERROR_FLASH_OPERATION_FAILED;
 
        if (res == ERROR_OK)
                command_print(cmd_ctx, "pic32mx pgm word complete");
        else
-               command_print(cmd_ctx, "pic32mx pgm word failed (status=0x%x)", status);
+               command_print(cmd_ctx, "pic32mx pgm word failed (status = 0x%x)", status);
 
        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)