flash: fix typos and duplicated words

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

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index a66541fe117194c75d1afaef7ce6cdd3c21accaa..87ffec8777d5514d34d3671fce3adb2fe43925b3 100644 (file)
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -19,9 +19,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -70,7 +68,7 @@ static int str9x_build_block_list(struct flash_bank *bank)
        struct str9x_flash_bank *str9x_info = bank->driver_priv;
 
        int i;
-       int num_sectors;
+       unsigned int num_sectors;
        int b0_sectors = 0, b1_sectors = 0;
        uint32_t offset = 0;
 
@@ -166,7 +164,6 @@ static int str9x_protect_check(struct flash_bank *bank)
        struct str9x_flash_bank *str9x_info = bank->driver_priv;
        struct target *target = bank->target;
 
-       int i;
        uint32_t adr;
        uint32_t status = 0;
        uint16_t hstatus = 0;
@@ -213,7 +210,7 @@ static int str9x_protect_check(struct flash_bank *bank)
        if (retval != ERROR_OK)
                return retval;
 
-       for (i = 0; i < bank->num_sectors; i++) {
+       for (unsigned int i = 0; i < bank->num_sectors; i++) {
                if (status & str9x_info->sector_bits[i])
                        bank->sectors[i].is_protected = 1;
                else
@@ -223,10 +220,10 @@ static int str9x_protect_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int str9x_erase(struct flash_bank *bank, int first, int last)
+static int str9x_erase(struct flash_bank *bank, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
-       int i;
        uint32_t adr;
        uint8_t status;
        uint8_t erase_cmd;
@@ -252,7 +249,7 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
        /* this is so the compiler can *know* */
        assert(total_timeout > 0);
 
-       for (i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                int retval;
                adr = bank->base + bank->sectors[i].offset;
 
@@ -303,17 +300,16 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                        break;
        }
 
-       for (i = first; i <= last; i++)
+       for (unsigned int i = first; i <= last; i++)
                bank->sectors[i].is_erased = 1;
 
        return ERROR_OK;
 }
 
-static int str9x_protect(struct flash_bank *bank,
-               int set, int first, int last)
+static int str9x_protect(struct flash_bank *bank, int set, unsigned int first,
+               unsigned int last)
 {
        struct target *target = bank->target;
-       int i;
        uint32_t adr;
        uint8_t status;
 
@@ -322,7 +318,7 @@ static int str9x_protect(struct flash_bank *bank,
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       for (i = first; i <= last; i++) {
+       for (unsigned int i = first; i <= last; i++) {
                /* Level One Protection */
 
                adr = bank->base + bank->sectors[i].offset;
@@ -347,7 +343,7 @@ static int str9x_protect(struct flash_bank *bank,
 }
 
 static int str9x_write_block(struct flash_bank *bank,
-               uint8_t *buffer, uint32_t offset, uint32_t count)
+               const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
        uint32_t buffer_size = 32768;
@@ -358,7 +354,7 @@ static int str9x_write_block(struct flash_bank *bank,
        struct arm_algorithm arm_algo;
        int retval = ERROR_OK;
 
-       /* see contib/loaders/flash/str9x.s for src */
+       /* see contrib/loaders/flash/str9x.s for src */
 
        static const uint32_t str9x_flash_write_code[] = {
                                        /* write:                               */
@@ -390,11 +386,12 @@ static int str9x_write_block(struct flash_bank *bank,
                        &write_algorithm) != ERROR_OK) {
                LOG_WARNING("no working area available, can't do block memory writes");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
-       };
+       }
 
-       target_write_buffer(target, write_algorithm->address,
-                       sizeof(str9x_flash_write_code),
-                       (uint8_t *)str9x_flash_write_code);
+       uint8_t code[sizeof(str9x_flash_write_code)];
+       target_buffer_set_u32_array(target, code, ARRAY_SIZE(str9x_flash_write_code),
+                       str9x_flash_write_code);
+       target_write_buffer(target, write_algorithm->address, sizeof(code), code);
 
        /* memory buffer */
        while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) {
@@ -458,7 +455,7 @@ static int str9x_write_block(struct flash_bank *bank,
 }
 
 static int str9x_write(struct flash_bank *bank,
-               uint8_t *buffer, uint32_t offset, uint32_t count)
+               const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
        uint32_t words_remaining = (count / 2);
@@ -469,7 +466,6 @@ static int str9x_write(struct flash_bank *bank,
        int retval;
        uint32_t check_address = offset;
        uint32_t bank_adr;
-       int i;
 
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -481,7 +477,7 @@ static int str9x_write(struct flash_bank *bank,
                return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
        }
 
-       for (i = 0; i < bank->num_sectors; i++) {
+       for (unsigned int i = 0; i < bank->num_sectors; i++) {
                uint32_t sec_start = bank->sectors[i].offset;
                uint32_t sec_end = sec_start + bank->sectors[i].size;
 
@@ -606,12 +602,6 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
 }
 #endif
 
-static int get_str9x_info(struct flash_bank *bank, char *buf, int buf_size)
-{
-       snprintf(buf, buf_size, "str9x flash driver info");
-       return ERROR_OK;
-}
-
 COMMAND_HANDLER(str9x_handle_flash_config_command)
 {
        struct target *target = NULL;
@@ -674,7 +664,7 @@ static const struct command_registration str9x_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver str9x_flash = {
+const struct flash_driver str9x_flash = {
        .name = "str9x",
        .commands = str9x_command_handlers,
        .flash_bank_command = str9x_flash_bank_command,
@@ -686,5 +676,5 @@ struct flash_driver str9x_flash = {
        .auto_probe = str9x_probe,
        .erase_check = default_flash_blank_check,
        .protect_check = str9x_protect_check,
-       .info = get_str9x_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };