ARM: only use one set of dummy FPA registers

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

diff --git a/src/flash/avrf.c b/src/flash/avrf.c
index 91aedb85a5eab9cf94ceea24630de8d81ef0a4ac..20c619dce964f1dacf7af2491514b417e3592d56 100644 (file)
--- a/src/flash/avrf.c
+++ b/src/flash/avrf.c
@@ -184,7 +184,7 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command)
 {
        struct avrf_flash_bank *avrf_info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank avr configuration");
                return ERROR_FLASH_BANK_INVALID;
@@ -198,21 +198,21 @@ FLASH_BANK_COMMAND_HANDLER(avrf_flash_bank_command)
        return ERROR_OK;
 }
 
-static int avrf_erase(struct flash_bank_s *bank, int first, int last)
+static int avrf_erase(struct flash_bank *bank, int first, int last)
 {
        LOG_INFO("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
-static int avrf_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int avrf_protect(struct flash_bank *bank, int set, int first, int last)
 {
        LOG_INFO("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
-static int avrf_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
        uint32_t cur_size, cur_buffer_size, page_size;
 
@@ -261,9 +261,9 @@ static int avrf_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offse
 #define EXTRACT_MFG(X)  (((X) & 0xffe) >> 1)
 #define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
 #define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)
-static int avrf_probe(struct flash_bank_s *bank)
+static int avrf_probe(struct flash_bank *bank)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        struct avrf_flash_bank *avrf_info = bank->driver_priv;
        struct avr_common *avr = target->arch_info;
        struct avrf_type *avr_info = NULL;
@@ -329,7 +329,7 @@ static int avrf_probe(struct flash_bank_s *bank)
        }
 }
 
-static int avrf_auto_probe(struct flash_bank_s *bank)
+static int avrf_auto_probe(struct flash_bank *bank)
 {
        struct avrf_flash_bank *avrf_info = bank->driver_priv;
        if (avrf_info->probed)
@@ -337,15 +337,15 @@ static int avrf_auto_probe(struct flash_bank_s *bank)
        return avrf_probe(bank);
 }
 
-static int avrf_protect_check(struct flash_bank_s *bank)
+static int avrf_protect_check(struct flash_bank *bank)
 {
        LOG_INFO("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
-static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int avrf_info(struct flash_bank *bank, char *buf, int buf_size)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
        struct avrf_type *avr_info = NULL;
        int i;
@@ -394,9 +394,9 @@ static int avrf_info(struct flash_bank_s *bank, char *buf, int buf_size)
        }
 }
 
-static int avrf_mass_erase(struct flash_bank_s *bank)
+static int avrf_mass_erase(struct flash_bank *bank)
 {
-       target_t *target = bank->target;
+       struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
 
        if (target->state != TARGET_HALTED)
@@ -419,14 +419,14 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
 {
        int i;
 
-       if (argc < 1)
+       if (CMD_ARGC < 1)
        {
-               command_print(cmd_ctx, "avr mass_erase <bank>");
+               command_print(CMD_CTX, "avr mass_erase <bank>");
                return ERROR_OK;
        }
 
-       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;
 
@@ -438,20 +438,20 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
                        bank->sectors[i].is_erased = 1;
                }
 
-               command_print(cmd_ctx, "avr mass erase complete");
+               command_print(CMD_CTX, "avr mass erase complete");
        }
        else
        {
-               command_print(cmd_ctx, "avr mass erase failed");
+               command_print(CMD_CTX, "avr mass erase failed");
        }
 
        LOG_DEBUG("%s", __FUNCTION__);
        return ERROR_OK;
 }
 
-static int avrf_register_commands(struct command_context_s *cmd_ctx)
+static int avrf_register_commands(struct command_context *cmd_ctx)
 {
-       command_t *avr_cmd = register_command(cmd_ctx, NULL, "avr",
+       struct command *avr_cmd = register_command(cmd_ctx, NULL, "avr",
                        NULL, COMMAND_ANY, "avr flash specific commands");
 
        register_command(cmd_ctx, avr_cmd, "mass_erase",