mips_ejtag_t -> struct mips_ejtag

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

diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index aa34aeaeb77458636fe1e167610961cb9893bef6..262200c019492f3b0dbebd5b2f1f5357ba50b60f 100644 (file)
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -62,9 +62,9 @@ static int pic32mx_write_word(struct flash_bank_s *bank, uint32_t address, uint3
 
 /* flash bank pic32mx <base> <size> 0 0 <target#>
  */
-static int pic32mx_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank)
+FLASH_BANK_COMMAND_HANDLER(pic32mx_flash_bank_command)
 {
-       pic32mx_flash_bank_t *pic32mx_info;
+       struct pic32mx_flash_bank *pic32mx_info;
 
        if (argc < 6)
        {
@@ -72,7 +72,7 @@ static int pic32mx_flash_bank_command(struct command_context_s *cmd_ctx, char *c
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       pic32mx_info = malloc(sizeof(pic32mx_flash_bank_t));
+       pic32mx_info = malloc(sizeof(struct pic32mx_flash_bank));
        bank->driver_priv = pic32mx_info;
 
        pic32mx_info->write_algorithm = NULL;
@@ -207,7 +207,7 @@ static int pic32mx_erase(struct flash_bank_s *bank, int first, int last)
 
 static int pic32mx_protect(struct flash_bank_s *bank, int set, int first, int last)
 {
-       pic32mx_flash_bank_t *pic32mx_info = NULL;
+       struct pic32mx_flash_bank *pic32mx_info = NULL;
        target_t *target = bank->target;
 #if 0
        uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
@@ -306,8 +306,8 @@ static int pic32mx_write_block(struct flash_bank_s *bank, uint8_t *buffer, uint3
        uint32_t address = bank->base + offset;
        int retval = ERROR_OK;
 #if 0
-       pic32mx_flash_bank_t *pic32mx_info = bank->driver_priv;
-       armv7m_algorithm_t armv7m_info;
+       struct pic32mx_flash_bank *pic32mx_info = bank->driver_priv;
+       struct armv7m_algorithm armv7m_info;
 
        uint8_t pic32mx_flash_write_code[] = {
                                                                        /* write: */
@@ -542,9 +542,9 @@ static int pic32mx_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t of
 static int pic32mx_probe(struct flash_bank_s *bank)
 {
        target_t *target = bank->target;
-       pic32mx_flash_bank_t *pic32mx_info = bank->driver_priv;
-       mips32_common_t *mips32 = target->arch_info;
-       mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       struct pic32mx_flash_bank *pic32mx_info = bank->driver_priv;
+       struct mips32_common *mips32 = target->arch_info;
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
        int i;
        uint16_t num_pages = 0;
        uint32_t device_id;
@@ -607,7 +607,7 @@ static int pic32mx_probe(struct flash_bank_s *bank)
        bank->num_sectors = num_pages;
        bank->chip_width = 4;
        bank->bus_width  = 4;
-       bank->sectors = malloc(sizeof(flash_sector_t) * num_pages);
+       bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
 
        for (i = 0; i < num_pages; i++)
        {
@@ -624,7 +624,7 @@ static int pic32mx_probe(struct flash_bank_s *bank)
 
 static int pic32mx_auto_probe(struct flash_bank_s *bank)
 {
-       pic32mx_flash_bank_t *pic32mx_info = bank->driver_priv;
+       struct pic32mx_flash_bank *pic32mx_info = bank->driver_priv;
        if (pic32mx_info->probed)
                return ERROR_OK;
        return pic32mx_probe(bank);
@@ -640,8 +640,8 @@ COMMAND_HANDLER(pic32mx_handle_part_id_command)
 static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size)
 {
        target_t *target = bank->target;
-       mips32_common_t *mips32 = target->arch_info;
-       mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
+       struct mips32_common *mips32 = target->arch_info;
+       struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
        uint32_t device_id;
        int printed = 0, i;
 
@@ -675,7 +675,7 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size)
 COMMAND_HANDLER(pic32mx_handle_lock_command)
 {
        target_t *target = NULL;
-       pic32mx_flash_bank_t *pic32mx_info = NULL;
+       struct pic32mx_flash_bank *pic32mx_info = NULL;
 
        if (argc < 1)
        {
@@ -721,7 +721,7 @@ COMMAND_HANDLER(pic32mx_handle_lock_command)
 COMMAND_HANDLER(pic32mx_handle_unlock_command)
 {
        target_t *target = NULL;
-       pic32mx_flash_bank_t *pic32mx_info = NULL;
+       struct pic32mx_flash_bank *pic32mx_info = NULL;
 
        if (argc < 1)
        {
@@ -904,7 +904,7 @@ static int pic32mx_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-flash_driver_t pic32mx_flash = {
+struct flash_driver pic32mx_flash = {
                .name = "pic32mx",
                .register_commands = &pic32mx_register_commands,
                .flash_bank_command = &pic32mx_flash_bank_command,