X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fpic32mx.c;h=32481273a8705fd184c7c73731a6bbe524f64250;hb=92fc7a6fdecac39ebc890ee3c2ae91f3fd50fdc5;hp=d9966bf557538862c8acc493f6a64644deeeb189;hpb=fc116380bf26ac00b8d0a37fee91e74118e12d8d;p=openocd
diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c
index d9966bf5..32481273 100644
--- a/src/flash/pic32mx.c
+++ b/src/flash/pic32mx.c
@@ -57,64 +57,14 @@ struct pic32mx_devs_s {
{ 0x00, NULL, 0 }
};
-static int pic32mx_register_commands(struct command_context_s *cmd_ctx);
-static int pic32mx_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank);
-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);
-static int pic32mx_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count);
static int pic32mx_write_row(struct flash_bank_s *bank, uint32_t address, uint32_t srcaddr);
static int pic32mx_write_word(struct flash_bank_s *bank, uint32_t address, uint32_t word);
-static int pic32mx_probe(struct flash_bank_s *bank);
-static int pic32mx_auto_probe(struct flash_bank_s *bank);
-//static int pic32mx_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int pic32mx_protect_check(struct flash_bank_s *bank);
-static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size);
-
-#if 0
-int pic32mx_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-int pic32mx_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-#endif
-static int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-//static int pic32mx_chip_erase(struct flash_bank_s *bank);
-
-flash_driver_t pic32mx_flash =
-{
- .name = "pic32mx",
- .register_commands = pic32mx_register_commands,
- .flash_bank_command = pic32mx_flash_bank_command,
- .erase = pic32mx_erase,
- .protect = pic32mx_protect,
- .write = pic32mx_write,
- .probe = pic32mx_probe,
- .auto_probe = pic32mx_auto_probe,
- .erase_check = default_flash_mem_blank_check,
- .protect_check = pic32mx_protect_check,
- .info = pic32mx_info
-};
-
-static int pic32mx_register_commands(struct command_context_s *cmd_ctx)
-{
- command_t *pic32mx_cmd = register_command(cmd_ctx, NULL, "pic32mx", NULL, COMMAND_ANY, "pic32mx flash specific commands");
-
-#if 0
- register_command(cmd_ctx, pic32mx_cmd, "lock", pic32mx_handle_lock_command, COMMAND_EXEC,
- "lock device");
- register_command(cmd_ctx, pic32mx_cmd, "unlock", pic32mx_handle_unlock_command, COMMAND_EXEC,
- "unlock protected device");
-#endif
- register_command(cmd_ctx, pic32mx_cmd, "chip_erase", pic32mx_handle_chip_erase_command, COMMAND_EXEC,
- "erase device");
- register_command(cmd_ctx, pic32mx_cmd, "pgm_word", pic32mx_handle_pgm_word_command, COMMAND_EXEC,
- "program a word");
- return ERROR_OK;
-}
/* flash bank pic32mx 0 0
*/
-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)
{
@@ -122,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;
@@ -257,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};
@@ -356,7 +306,7 @@ 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;
+ struct pic32mx_flash_bank *pic32mx_info = bank->driver_priv;
armv7m_algorithm_t armv7m_info;
uint8_t pic32mx_flash_write_code[] = {
@@ -592,7 +542,7 @@ 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;
+ struct pic32mx_flash_bank *pic32mx_info = bank->driver_priv;
mips32_common_t *mips32 = target->arch_info;
mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
int i;
@@ -657,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++)
{
@@ -674,14 +624,14 @@ 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);
}
#if 0
-static int pic32mx_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(pic32mx_handle_part_id_command)
{
return ERROR_OK;
}
@@ -722,10 +672,10 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size)
}
#if 0
-int pic32mx_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+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)
{
@@ -768,10 +718,10 @@ int pic32mx_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, ch
return ERROR_OK;
}
-int pic32mx_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+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)
{
@@ -858,7 +808,7 @@ static int pic32mx_chip_erase(struct flash_bank_s *bank)
}
#endif
-static int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(pic32mx_handle_chip_erase_command)
{
#if 0
int i;
@@ -893,7 +843,7 @@ static int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx,
return ERROR_OK;
}
-static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(pic32mx_handle_pgm_word_command)
{
uint32_t address, value;
int status, res;
@@ -932,3 +882,38 @@ static int pic32mx_handle_pgm_word_command(struct command_context_s *cmd_ctx, ch
return ERROR_OK;
}
+
+static int pic32mx_register_commands(struct command_context_s *cmd_ctx)
+{
+ command_t *pic32mx_cmd = register_command(cmd_ctx, NULL, "pic32mx",
+ NULL, COMMAND_ANY, "pic32mx flash specific commands");
+#if 0
+ register_command(cmd_ctx, pic32mx_cmd, "lock",
+ pic32mx_handle_lock_command, COMMAND_EXEC,
+ "lock device");
+ register_command(cmd_ctx, pic32mx_cmd, "unlock",
+ pic32mx_handle_unlock_command, COMMAND_EXEC,
+ "unlock protected device");
+#endif
+ register_command(cmd_ctx, pic32mx_cmd, "chip_erase",
+ pic32mx_handle_chip_erase_command, COMMAND_EXEC,
+ "erase device");
+ register_command(cmd_ctx, pic32mx_cmd, "pgm_word",
+ pic32mx_handle_pgm_word_command, COMMAND_EXEC,
+ "program a word");
+ return ERROR_OK;
+}
+
+struct flash_driver pic32mx_flash = {
+ .name = "pic32mx",
+ .register_commands = &pic32mx_register_commands,
+ .flash_bank_command = &pic32mx_flash_bank_command,
+ .erase = &pic32mx_erase,
+ .protect = &pic32mx_protect,
+ .write = &pic32mx_write,
+ .probe = &pic32mx_probe,
+ .auto_probe = &pic32mx_auto_probe,
+ .erase_check = &default_flash_mem_blank_check,
+ .protect_check = &pic32mx_protect_check,
+ .info = &pic32mx_info,
+ };