command_handler: change to 'argc' to CMD_ARGC

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

diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index bae895d2240d635fdb3daa45a82acc10fb318074..c103e572d1a7c95f0593cde04d8a513b9a3b2bd3 100644 (file)
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -29,11 +29,12 @@
 
 #include "str9x.h"
 #include "arm966e.h"
+#include "algorithm.h"
 
 
 static uint32_t bank1start = 0x00080000;
 
-static int str9x_build_block_list(struct flash_bank_s *bank)
+static int str9x_build_block_list(struct flash_bank *bank)
 {
        struct str9x_flash_bank *str9x_info = bank->driver_priv;
 
@@ -120,7 +121,7 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
 {
        struct str9x_flash_bank *str9x_info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank str9x configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -136,11 +137,11 @@ FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command)
        return ERROR_OK;
 }
 
-static int str9x_protect_check(struct flash_bank_s *bank)
+static int str9x_protect_check(struct flash_bank *bank)
 {
        int retval;
        struct str9x_flash_bank *str9x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct target *target = bank->target;
 
        int i;
        uint32_t adr;
@@ -214,9 +215,9 @@ static int str9x_protect_check(struct flash_bank_s *bank)
        return ERROR_OK;
 }
 
-static int str9x_erase(struct flash_bank_s *bank, int first, int last)
+static int str9x_erase(struct flash_bank *bank, int first, int last)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        int i;
        uint32_t adr;
        uint8_t status;
@@ -306,10 +307,10 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last)
        return ERROR_OK;
 }
 
-static int str9x_protect(struct flash_bank_s *bank,
+static int str9x_protect(struct flash_bank *bank,
                int set, int first, int last)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        int i;
        uint32_t adr;
        uint8_t status;
@@ -345,13 +346,13 @@ static int str9x_protect(struct flash_bank_s *bank,
        return ERROR_OK;
 }
 
-static int str9x_write_block(struct flash_bank_s *bank,
+static int str9x_write_block(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct str9x_flash_bank *str9x_info = bank->driver_priv;
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        uint32_t buffer_size = 8192;
-       working_area_t *source;
+       struct working_area *source;
        uint32_t address = bank->base + offset;
        struct reg_param reg_params[4];
        struct armv4_5_algorithm armv4_5_info;
@@ -454,10 +455,10 @@ static int str9x_write_block(struct flash_bank_s *bank,
        return retval;
 }
 
-static int str9x_write(struct flash_bank_s *bank,
+static int str9x_write(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        uint32_t words_remaining = (count / 2);
        uint32_t bytes_remaining = (count & 0x00000001);
        uint32_t address = bank->base + offset;
@@ -612,7 +613,7 @@ static int str9x_write(struct flash_bank_s *bank,
        return ERROR_OK;
 }
 
-static int str9x_probe(struct flash_bank_s *bank)
+static int str9x_probe(struct flash_bank *bank)
 {
        return ERROR_OK;
 }
@@ -624,7 +625,7 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
 }
 #endif
 
-static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int str9x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "str9x flash driver info");
        return ERROR_OK;
@@ -633,15 +634,15 @@ static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size)
 COMMAND_HANDLER(str9x_handle_flash_config_command)
 {
        struct str9x_flash_bank *str9x_info;
-       target_t *target = NULL;
+       struct target *target = NULL;
 
-       if (argc < 5)
+       if (CMD_ARGC < 5)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       flash_bank_t *bank;
-       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank);
+       struct flash_bank *bank;
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &bank);
        if (ERROR_OK != retval)
                return retval;
 
@@ -675,9 +676,9 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
        return ERROR_OK;
 }
 
-static int str9x_register_commands(struct command_context_s *cmd_ctx)
+static int str9x_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *str9x_cmd = register_command(cmd_ctx, NULL, "str9x",
+       struct command *str9x_cmd = register_command(cmd_ctx, NULL, "str9x",
                        NULL, COMMAND_ANY, "str9x flash commands");
 
        register_command(cmd_ctx, str9x_cmd, "flash_config",