ARM: only use one set of dummy FPA registers

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

diff --git a/src/flash/tms470.c b/src/flash/tms470.c
index 6e1516f35b74d0c1c1a040cdee0654aeae755e33..f6f3900fc4cc1089bcf26d7c9ae08ee5398b9470 100644 (file)
--- a/src/flash/tms470.c
+++ b/src/flash/tms470.c
@@ -291,43 +291,43 @@ static uint32_t flashKeys[4];
 
 COMMAND_HANDLER(tms470_handle_flash_keyset_command)
 {
-       if (argc > 4)
+       if (CMD_ARGC > 4)
        {
-               command_print(cmd_ctx, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
+               command_print(CMD_CTX, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
                return ERROR_INVALID_ARGUMENTS;
        }
-       else if (argc == 4)
+       else if (CMD_ARGC == 4)
        {
                int i;
 
                for (i = 0; i < 4; i++)
                {
-                       int start = (0 == strncmp(args[i], "0x", 2)) ? 2 : 0;
+                       int start = (0 == strncmp(CMD_ARGV[i], "0x", 2)) ? 2 : 0;
 
-                       if (1 != sscanf(&args[i][start], "%" SCNx32 "", &flashKeys[i]))
+                       if (1 != sscanf(&CMD_ARGV[i][start], "%" SCNx32 "", &flashKeys[i]))
                        {
-                               command_print(cmd_ctx, "could not process flash key %s", args[i]);
-                               LOG_ERROR("could not process flash key %s", args[i]);
+                               command_print(CMD_CTX, "could not process flash key %s", CMD_ARGV[i]);
+                               LOG_ERROR("could not process flash key %s", CMD_ARGV[i]);
                                return ERROR_INVALID_ARGUMENTS;
                        }
                }
 
                keysSet = 1;
        }
-       else if (argc != 0)
+       else if (CMD_ARGC != 0)
        {
-               command_print(cmd_ctx, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
+               command_print(CMD_CTX, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
                return ERROR_INVALID_ARGUMENTS;
        }
 
        if (keysSet)
        {
-               command_print(cmd_ctx, "using flash keys 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 "",
+               command_print(CMD_CTX, "using flash keys 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 ", 0x%08" PRIx32 "",
                              flashKeys[0], flashKeys[1], flashKeys[2], flashKeys[3]);
        }
        else
        {
-               command_print(cmd_ctx, "flash keys not set");
+               command_print(CMD_CTX, "flash keys not set");
        }
 
        return ERROR_OK;
@@ -355,25 +355,25 @@ static int oscMHz = 12;
 
 COMMAND_HANDLER(tms470_handle_osc_megahertz_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
        {
-               command_print(cmd_ctx, "tms470 osc_megahertz <MHz>");
+               command_print(CMD_CTX, "tms470 osc_megahertz <MHz>");
                return ERROR_INVALID_ARGUMENTS;
        }
-       else if (argc == 1)
+       else if (CMD_ARGC == 1)
        {
-               sscanf(args[0], "%d", &oscMHz);
+               sscanf(CMD_ARGV[0], "%d", &oscMHz);
        }
 
        if (oscMHz <= 0)
        {
                LOG_ERROR("osc_megahertz must be positive and non-zero!");
-               command_print(cmd_ctx, "osc_megahertz must be positive and non-zero!");
+               command_print(CMD_CTX, "osc_megahertz must be positive and non-zero!");
                oscMHz = 12;
                return ERROR_INVALID_ARGUMENTS;
        }
 
-       command_print(cmd_ctx, "osc_megahertz=%d", oscMHz);
+       command_print(CMD_CTX, "osc_megahertz=%d", oscMHz);
 
        return ERROR_OK;
 }
@@ -384,18 +384,18 @@ static int plldis = 0;
 
 COMMAND_HANDLER(tms470_handle_plldis_command)
 {
-       if (argc > 1)
+       if (CMD_ARGC > 1)
        {
-               command_print(cmd_ctx, "tms470 plldis <0 | 1>");
+               command_print(CMD_CTX, "tms470 plldis <0 | 1>");
                return ERROR_INVALID_ARGUMENTS;
        }
-       else if (argc == 1)
+       else if (CMD_ARGC == 1)
        {
-               sscanf(args[0], "%d", &plldis);
+               sscanf(CMD_ARGV[0], "%d", &plldis);
                plldis = plldis ? 1 : 0;
        }
 
-       command_print(cmd_ctx, "plldis=%d", plldis);
+       command_print(CMD_CTX, "plldis=%d", plldis);
 
        return ERROR_OK;
 }
@@ -817,9 +817,9 @@ static int tms470_erase_sector(struct flash_bank *bank, int sector)
               Implementation of Flash Driver Interfaces
    ---------------------------------------------------------------------- */
 
-static int tms470_register_commands(struct command_context_s *cmd_ctx)
+static int tms470_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *tms470_cmd = register_command(cmd_ctx, NULL, "tms470", NULL, COMMAND_ANY, "applies to TI tms470 family");
+       struct command *tms470_cmd = register_command(cmd_ctx, NULL, "tms470", NULL, COMMAND_ANY, "applies to TI tms470 family");
 
        register_command(cmd_ctx, tms470_cmd, "flash_keyset", tms470_handle_flash_keyset_command, COMMAND_ANY, "tms470 flash_keyset <key0> <key1> <key2> <key3>");
        register_command(cmd_ctx, tms470_cmd, "osc_megahertz", tms470_handle_osc_megahertz_command, COMMAND_ANY, "tms470 osc_megahertz <MHz>");