at91samd: add chip IDs for SAMC20 and SAMC21 families

[openocd.git] / src / flash / nor / mdr.c

diff --git a/src/flash/nor/mdr.c b/src/flash/nor/mdr.c
index 3ecee1c84f779f0dc1e7fed03022884ab208815d..98e013aa355585b77d10dcac63f78eaf11fdaff1 100644 (file)
--- a/src/flash/nor/mdr.c
+++ b/src/flash/nor/mdr.c
@@ -159,7 +159,7 @@ static int mdr_erase(struct flash_bank *bank, int first, int last)
 
        retval = target_write_u32(target, FLASH_KEY, KEY);
        if (retval != ERROR_OK)
-               goto reset_pg_and_lock;
+               return retval;
 
        retval = target_read_u32(target, FLASH_CMD, &flash_cmd);
        if (retval != ERROR_OK)
@@ -223,7 +223,7 @@ static int mdr_protect(struct flash_bank *bank, int set, int first, int last)
        return ERROR_OK;
 }
 
-static int mdr_write_block(struct flash_bank *bank, uint8_t *buffer,
+static int mdr_write_block(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -314,7 +314,7 @@ static int mdr_write_block(struct flash_bank *bank, uint8_t *buffer,
        return retval;
 }
 
-static int mdr_write(struct flash_bank *bank, uint8_t *buffer,
+static int mdr_write(struct flash_bank *bank, const uint8_t *buffer,
                uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
@@ -345,7 +345,7 @@ static int mdr_write(struct flash_bank *bank, uint8_t *buffer,
                LOG_INFO("odd number of bytes to write, padding with 0xff");
                buffer = memcpy(new_buffer, buffer, count);
                while (rem--)
-                       buffer[count++] = 0xff;
+                       new_buffer[count++] = 0xff;
        }
 
        uint32_t flash_cmd, cur_per_clock;
@@ -353,21 +353,22 @@ static int mdr_write(struct flash_bank *bank, uint8_t *buffer,
 
        retval = target_read_u32(target, MD_PER_CLOCK, &cur_per_clock);
        if (retval != ERROR_OK)
-               return retval;
+               goto free_buffer;
 
        if (!(cur_per_clock & MD_PER_CLOCK_RST_CLK)) {
                /* Something's very wrong if the RST_CLK module is not clocked */
                LOG_ERROR("Target needs reset before flash operations");
-               return ERROR_FLASH_OPERATION_FAILED;
+               retval = ERROR_FLASH_OPERATION_FAILED;
+               goto free_buffer;
        }
 
        retval = target_write_u32(target, MD_PER_CLOCK, cur_per_clock | MD_PER_CLOCK_EEPROM);
        if (retval != ERROR_OK)
-               return retval;
+               goto free_buffer;
 
        retval = target_write_u32(target, FLASH_KEY, KEY);
        if (retval != ERROR_OK)
-               goto reset_pg_and_lock;
+               goto free_buffer;
 
        retval = target_read_u32(target, FLASH_CMD, &flash_cmd);
        if (retval != ERROR_OK)
@@ -466,6 +467,7 @@ reset_pg_and_lock:
        if (retval == ERROR_OK)
                retval = retval2;
 
+free_buffer:
        if (new_buffer)
                free(new_buffer);
 
@@ -480,6 +482,11 @@ static int mdr_probe(struct flash_bank *bank)
        page_count = mdr_info->page_count;
        page_size = bank->size / page_count;
 
+       if (bank->sectors) {
+               free(bank->sectors);
+               bank->sectors = NULL;
+       }
+
        bank->num_sectors = page_count;
        bank->sectors = malloc(sizeof(struct flash_sector) * page_count);
 
@@ -514,6 +521,8 @@ static int get_mdr_info(struct flash_bank *bank, char *buf, int buf_size)
 
 struct flash_driver mdr_flash = {
        .name = "mdr",
+       .usage = "flash bank <name> mdr <base> <size> 0 0 <target#> <type> <page_count> <sec_count>\n"
+       "<type>: 0 for main memory, 1 for info memory",
        .flash_bank_command = mdr_flash_bank_command,
        .erase = mdr_erase,
        .protect = mdr_protect,