command_handler: change to 'argc' to CMD_ARGC

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

diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c
index 8f870bc0724d1be736efc3b77b4749640bdf6235..193bfd3598cf409505e1a792f07b2a7e62c7308b 100644 (file)
--- a/src/flash/at91sam7.c
+++ b/src/flash/at91sam7.c
@@ -743,7 +743,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
        at91sam7_info->ext_freq = 0;
        at91sam7_info->flash_autodetection = 0;
 
-       if (argc < 13)
+       if (CMD_ARGC < 13)
        {
                at91sam7_info->flash_autodetection = 1;
                return ERROR_OK;
@@ -760,7 +760,7 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
        COMMAND_PARSE_NUMBER(u16, args[11], page_size);
        COMMAND_PARSE_NUMBER(u16, args[12], num_nvmbits);
 
-       if (argc == 14) {
+       if (CMD_ARGC == 14) {
                unsigned long freq;
                COMMAND_PARSE_NUMBER(ulong, args[13], freq);
                ext_freq = freq * 1000;
@@ -979,7 +979,7 @@ static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t off
                return ERROR_FLASH_BANK_NOT_PROBED;
 
        first_page = offset/dst_min_alignment;
-       last_page = CEIL(offset + count, dst_min_alignment);
+       last_page = DIV_ROUND_UP(offset + count, dst_min_alignment);
 
        LOG_DEBUG("first_page: %i, last_page: %i, count %i", (int)first_page, (int)last_page, (int)count);
 
@@ -997,7 +997,7 @@ static int at91sam7_write(struct flash_bank *bank, uint8_t *buffer, uint32_t off
 
                /* Write one block to the PageWriteBuffer */
                buffer_pos = (pagen-first_page)*dst_min_alignment;
-               wcount = CEIL(count,4);
+               wcount = DIV_ROUND_UP(count,4);
                if ((retval = target_write_memory(target, bank->base + pagen*dst_min_alignment, 4, wcount, buffer + buffer_pos)) != ERROR_OK)
                {
                        return retval;
@@ -1107,7 +1107,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
        struct at91sam7_flash_bank *at91sam7_info;
        int retval;
 
-       if (argc != 2)
+       if (CMD_ARGC != 2)
        {
                command_print(cmd_ctx, "at91sam7 gpnvm <bit> <set | clear>");
                return ERROR_OK;
@@ -1178,9 +1178,9 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
        return ERROR_OK;
 }
 
-static int at91sam7_register_commands(struct command_context_s *cmd_ctx)
+static int at91sam7_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
+       struct command *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
                        NULL, COMMAND_ANY, NULL);
 
        register_command(cmd_ctx, at91sam7_cmd, "gpnvm",