str9x: -Wshadow warning fixes

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

diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c
index 845d589de0da1b2fb2ad83cf889d8517d22ffdd8..5ce5d455f4f91ec6372ac66875f3376de83702e3 100644 (file)
--- a/src/flash/nor/stm32x.c
+++ b/src/flash/nor/stm32x.c
@@ -331,7 +331,7 @@ static int stm32x_erase(struct flash_bank *bank, int first, int last)
                target_write_u32(target, STM32_FLASH_AR, bank->base + bank->sectors[i].offset);
                target_write_u32(target, STM32_FLASH_CR, FLASH_PER | FLASH_STRT);
 
-               status = stm32x_wait_status_busy(bank, 10);
+               status = stm32x_wait_status_busy(bank, 100);
 
                if (status & FLASH_WRPRTERR)
                        return ERROR_FLASH_OPERATION_FAILED;
@@ -481,7 +481,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
                return retval;
 
        /* memory buffer */
-       while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK)
+       while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK)
        {
                buffer_size /= 2;
                if (buffer_size <= 256)
@@ -676,12 +676,6 @@ static int stm32x_probe(struct flash_bank *bank)
        uint32_t device_id;
        int page_size;
 
-       if (bank->target->state != TARGET_HALTED)
-       {
-               LOG_ERROR("Target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
        stm32x_info->probed = 0;
 
        /* read stm32 device id register */
@@ -781,6 +775,12 @@ static int stm32x_probe(struct flash_bank *bank)
        /* calculate numbers of pages */
        num_pages /= (page_size / 1024);
 
+       if (bank->sectors)
+       {
+               free(bank->sectors);
+               bank->sectors = NULL;
+       }
+
        bank->base = 0x08000000;
        bank->size = (num_pages * page_size);
        bank->num_sectors = num_pages;
@@ -814,7 +814,7 @@ COMMAND_HANDLER(stm32x_handle_part_id_command)
 }
 #endif
 
-static int stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        struct target *target = bank->target;
        uint32_t device_id;
@@ -1189,20 +1189,20 @@ static int stm32x_mass_erase(struct flash_bank *bank)
        target_write_u32(target, STM32_FLASH_CR, FLASH_MER);
        target_write_u32(target, STM32_FLASH_CR, FLASH_MER | FLASH_STRT);
 
-       status = stm32x_wait_status_busy(bank, 10);
+       status = stm32x_wait_status_busy(bank, 100);
 
        target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK);
 
        if (status & FLASH_WRPRTERR)
        {
                LOG_ERROR("stm32x device protected");
-               return ERROR_OK;
+               return ERROR_FLASH_OPERATION_FAILED;
        }
 
        if (status & FLASH_PGERR)
        {
                LOG_ERROR("stm32x device programming failed");
-               return ERROR_OK;
+               return ERROR_FLASH_OPERATION_FAILED;
        }
 
        return ERROR_OK;
@@ -1223,7 +1223,8 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
        if (ERROR_OK != retval)
                return retval;
 
-       if (stm32x_mass_erase(bank) == ERROR_OK)
+       retval = stm32x_mass_erase(bank);
+       if (retval == ERROR_OK)
        {
                /* set all sectors as erased */
                for (i = 0; i < bank->num_sectors; i++)
@@ -1238,7 +1239,7 @@ COMMAND_HANDLER(stm32x_handle_mass_erase_command)
                command_print(CMD_CTX, "stm32x mass erase failed");
        }
 
-       return ERROR_OK;
+       return retval;
 }
 
 static const struct command_registration stm32x_exec_command_handlers[] = {
@@ -1299,9 +1300,10 @@ struct flash_driver stm32x_flash = {
        .erase = stm32x_erase,
        .protect = stm32x_protect,
        .write = stm32x_write,
+       .read = default_flash_read,
        .probe = stm32x_probe,
        .auto_probe = stm32x_auto_probe,
        .erase_check = default_flash_mem_blank_check,
        .protect_check = stm32x_protect_check,
-       .info = stm32x_info,
+       .info = get_stm32x_info,
 };