optimize: replace while loop by memcpy

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

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index 8f8e83c885c249e3e1165e739f0b121ae86dfeef..674522c73464047bf5e482b01aab79018289ca86 100644 (file)
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -158,8 +158,7 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
 
        if (CMD_ARGC < 6)
        {
-               LOG_WARNING("incomplete flash_bank str9x configuration");
-               return ERROR_FLASH_BANK_INVALID;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        str9x_info = malloc(sizeof(struct str9x_flash_bank));
@@ -280,6 +279,9 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                total_timeout = 1000;
        }
 
+       /* this is so the compiler can *know* */
+       assert(total_timeout > 0);
+
        for (i = first; i <= last; i++)
        {
                int retval;
@@ -562,7 +564,7 @@ static int str9x_write(struct flash_bank *bank,
                        }
                        else if (retval == ERROR_FLASH_OPERATION_FAILED)
                        {
-                               LOG_ERROR("flash writing failed with error code: 0x%x", retval);
+                               LOG_ERROR("flash writing failed");
                                return ERROR_FLASH_OPERATION_FAILED;
                        }
                }
@@ -616,14 +618,9 @@ static int str9x_write(struct flash_bank *bank,
        if (bytes_remaining)
        {
                uint8_t last_halfword[2] = {0xff, 0xff};
-               i = 0;
 
-               while (bytes_remaining > 0)
-               {
-                       last_halfword[i++] = *(buffer + bytes_written);
-                       bytes_remaining--;
-                       bytes_written++;
-               }
+               /* copy the last remaining bytes into the write buffer */
+               memcpy(last_halfword, buffer+bytes_written, bytes_remaining);
 
                bank_adr = address & ~0x03;
 
@@ -681,7 +678,6 @@ static int get_str9x_info(struct flash_bank *bank, char *buf, int buf_size)
 
 COMMAND_HANDLER(str9x_handle_flash_config_command)
 {
-       struct str9x_flash_bank *str9x_info;
        struct target *target = NULL;
 
        if (CMD_ARGC < 5)
@@ -700,8 +696,6 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], bbadr);
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], nbbadr);
 
-       str9x_info = bank->driver_priv;
-
        target = bank->target;
 
        if (bank->target->state != TARGET_HALTED)