at91sam7: use register_commands()

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

diff --git a/src/flash/at91sam7.c b/src/flash/at91sam7.c
index 18cfb986770569f6abe3c0a39aee2eec7abbf876..02046608a1894cd0e9ae92b5d7709618e9941451 100644 (file)
--- a/src/flash/at91sam7.c
+++ b/src/flash/at91sam7.c
@@ -743,26 +743,26 @@ 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;
        }
 
-       COMMAND_PARSE_NUMBER(u32, args[1], base_address);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], base_address);
 
-       COMMAND_PARSE_NUMBER(int, args[3], chip_width);
-       COMMAND_PARSE_NUMBER(int, args[4], bus_width);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], chip_width);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[4], bus_width);
 
-       COMMAND_PARSE_NUMBER(int, args[8], banks_num);
-       COMMAND_PARSE_NUMBER(int, args[9], num_sectors);
-       COMMAND_PARSE_NUMBER(u16, args[10], pages_per_sector);
-       COMMAND_PARSE_NUMBER(u16, args[11], page_size);
-       COMMAND_PARSE_NUMBER(u16, args[12], num_nvmbits);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[8], banks_num);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[9], num_sectors);
+       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[10], pages_per_sector);
+       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[11], page_size);
+       COMMAND_PARSE_NUMBER(u16, CMD_ARGV[12], num_nvmbits);
 
-       if (argc == 14) {
+       if (CMD_ARGC == 14) {
                unsigned long freq;
-               COMMAND_PARSE_NUMBER(ulong, args[13], freq);
+               COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[13], freq);
                ext_freq = freq * 1000;
                at91sam7_info->ext_freq = ext_freq;
        }
@@ -774,8 +774,8 @@ FLASH_BANK_COMMAND_HANDLER(at91sam7_flash_bank_command)
                return ERROR_OK;
        }
 
-       target_name = calloc(strlen(args[7]) + 1, sizeof(char));
-       strcpy(target_name, args[7]);
+       target_name = calloc(strlen(CMD_ARGV[7]) + 1, sizeof(char));
+       strcpy(target_name, CMD_ARGV[7]);
 
        /* calculate bank size  */
        bank_size = num_sectors * pages_per_sector * page_size;
@@ -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,9 +1107,9 @@ 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>");
+               command_print(CMD_CTX, "at91sam7 gpnvm <bit> <set | clear>");
                return ERROR_OK;
        }
 
@@ -1120,7 +1120,7 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
        }
        if (strcmp(bank->driver->name, "at91sam7"))
        {
-               command_print(cmd_ctx, "not an at91sam7 flash bank '%s'", args[0]);
+               command_print(CMD_CTX, "not an at91sam7 flash bank '%s'", CMD_ARGV[0]);
                return ERROR_FLASH_BANK_INVALID;
        }
        if (bank->target->state != TARGET_HALTED)
@@ -1129,11 +1129,11 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       if (strcmp(args[1], "set") == 0)
+       if (strcmp(CMD_ARGV[1], "set") == 0)
        {
                flashcmd = SGPB;
        }
-       else if (strcmp(args[1], "clear") == 0)
+       else if (strcmp(CMD_ARGV[1], "clear") == 0)
        {
                flashcmd = CGPB;
        }
@@ -1152,10 +1152,10 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
                }
        }
 
-       COMMAND_PARSE_NUMBER(int, args[0], bit);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], bit);
        if ((bit < 0) || (bit >= at91sam7_info->num_nvmbits))
        {
-               command_print(cmd_ctx, "gpnvm bit '#%s' is out of bounds for target %s", args[0], at91sam7_info->target_name);
+               command_print(CMD_CTX, "gpnvm bit '#%s' is out of bounds for target %s", CMD_ARGV[0], at91sam7_info->target_name);
                return ERROR_OK;
        }
 
@@ -1178,17 +1178,29 @@ COMMAND_HANDLER(at91sam7_handle_gpnvm_command)
        return ERROR_OK;
 }
 
+static const struct command_registration at91sam7_exec_command_handlers[] = {
+       {
+               .name = "gpnvm",
+               .handler = &at91sam7_handle_gpnvm_command,
+               .mode = COMMAND_EXEC,
+               .usage = "gpnvm <bit> set | clear, "
+                       "set or clear one gpnvm bit",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration at91sam7_command_handlers[] = {
+       {
+               .name = "at91sam7",
+               .mode = COMMAND_ANY,
+               .help = "at91sam7 flash command group",
+               .chain = at91sam7_exec_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 static int at91sam7_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *at91sam7_cmd = register_command(cmd_ctx, NULL, "at91sam7",
-                       NULL, COMMAND_ANY, NULL);
-
-       register_command(cmd_ctx, at91sam7_cmd, "gpnvm",
-                       at91sam7_handle_gpnvm_command, COMMAND_EXEC,
-                       "at91sam7 gpnvm <bit> set | clear, "
-                       "set or clear one gpnvm bit");
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL, at91sam7_command_handlers);
 }
 
 struct flash_driver at91sam7_flash = {