struct fileio: improve member types

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

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 32c1f4907668c5a5455abbf67f392b677fdbd9fe..03d4547d407df8307e6585479e991108da2ad1c1 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -77,7 +77,7 @@ struct flash_driver *flash_drivers[] = {
 };
 
 struct flash_bank *flash_banks;
-static         command_t *flash_cmd;
+static         struct command *flash_cmd;
 
 /* wafer thin wrapper for invoking the flash driver */
 static int flash_driver_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
@@ -198,11 +198,11 @@ struct flash_bank *get_flash_bank_by_num(int num)
        return p;
 }
 
-int flash_command_get_bank_by_num(
-       struct command_context *cmd_ctx, const char *str, struct flash_bank **bank)
+COMMAND_HELPER(flash_command_get_bank_by_num,
+       unsigned name_index, struct flash_bank **bank)
 {
        unsigned bank_num;
-       COMMAND_PARSE_NUMBER(uint, str, bank_num);
+       COMMAND_PARSE_NUMBER(uint, args[name_index], bank_num);
 
        *bank = get_flash_bank_by_num(bank_num);
        if (!*bank)
@@ -403,7 +403,7 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
        }
 
        struct flash_bank *p;
-       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
        if (ERROR_OK != retval)
                return retval;
 
@@ -491,7 +491,7 @@ COMMAND_HANDLER(handle_flash_protect_check_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct flash_bank *p;
-       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
        if (ERROR_OK != retval)
                return retval;
 
@@ -821,7 +821,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
        duration_start(&bench);
 
        struct flash_bank *p;
-       int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+       int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
        if (ERROR_OK != retval)
                return retval;
 
@@ -847,7 +847,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 
        if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
        {
-               command_print(cmd_ctx, "wrote %lld byte from file %s to flash bank %u"
+               command_print(cmd_ctx, "wrote %zu byte from file %s to flash bank %u"
                                " at offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
                                fileio.size, args[1], p->bank_number, offset,
                                duration_elapsed(&bench), duration_kbps(&bench, fileio.size));