X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fat91sam3.c;h=4cf4d2091836ebe90574e8bb4789e3168868b9a1;hp=335f8ab58d30dcb6849638eedb4e3a9873af7a10;hb=23402315ce01071f30d7ec0c5ca7563ce41f1cc6;hpb=632fd663a821047df9a9b965ec1c35d6b034ebba diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c index 335f8ab58d..4cf4d20918 100644 --- a/src/flash/at91sam3.c +++ b/src/flash/at91sam3.c @@ -60,10 +60,8 @@ #include #include #include -#include "log.h" #include "types.h" #include "flash.h" -#include "target.h" #include "membuf.h" #include "at91sam3.h" #include "time_support.h" @@ -175,7 +173,7 @@ struct sam3_bank_private { // so we can find the chip we belong to struct sam3_chip *pChip; // so we can find the orginal bank pointer - flash_bank_t *pBank; + struct flash_bank *pBank; unsigned bank_number; uint32_t controller_address; uint32_t base_address; @@ -215,7 +213,7 @@ struct sam3_chip { // this is "initialized" from the global const structure struct sam3_chip_details details; - target_t *target; + struct target *target; struct sam3_cfg cfg; struct membuf *mbuf; @@ -231,9 +229,9 @@ struct sam3_reg_list { static struct sam3_chip *all_sam3_chips; static struct sam3_chip * -get_current_sam3(struct command_context_s *cmd_ctx) +get_current_sam3(struct command_context *cmd_ctx) { - target_t *t; + struct target *t; static struct sam3_chip *p; t = get_current_target(cmd_ctx); @@ -1393,7 +1391,7 @@ sam3_explain_mckr(struct sam3_chip *pChip) #if 0 static struct sam3_chip * -target2sam3(target_t *pTarget) +target2sam3(struct target *pTarget) { struct sam3_chip *pChip; @@ -1456,7 +1454,7 @@ static const struct sam3_reg_list sam3_all_regs[] = { static struct sam3_bank_private * -get_sam3_bank_private(flash_bank_t *bank) +get_sam3_bank_private(struct flash_bank *bank) { return (struct sam3_bank_private *)(bank->driver_priv); } @@ -1582,7 +1580,7 @@ sam3_GetInfo(struct sam3_chip *pChip) static int -sam3_erase_check(struct flash_bank_s *bank) +sam3_erase_check(struct flash_bank *bank) { int x; @@ -1606,7 +1604,7 @@ sam3_erase_check(struct flash_bank_s *bank) } static int -sam3_protect_check(struct flash_bank_s *bank) +sam3_protect_check(struct flash_bank *bank) { int r; uint32_t v=0; @@ -1709,7 +1707,7 @@ sam3_GetDetails(struct sam3_bank_private *pPrivate) const struct sam3_chip_details *pDetails; struct sam3_chip *pChip; void *vp; - flash_bank_t *saved_banks[SAM3_MAX_FLASH_BANKS]; + struct flash_bank *saved_banks[SAM3_MAX_FLASH_BANKS]; unsigned x; const char *cp; @@ -1777,7 +1775,7 @@ sam3_GetDetails(struct sam3_bank_private *pPrivate) static int -_sam3_probe(struct flash_bank_s *bank, int noise) +_sam3_probe(struct flash_bank *bank, int noise) { unsigned x; int r; @@ -1861,13 +1859,13 @@ _sam3_probe(struct flash_bank_s *bank, int noise) } static int -sam3_probe(struct flash_bank_s *bank) +sam3_probe(struct flash_bank *bank) { return _sam3_probe(bank, 1); } static int -sam3_auto_probe(struct flash_bank_s *bank) +sam3_auto_probe(struct flash_bank *bank) { return _sam3_probe(bank, 0); } @@ -1875,7 +1873,7 @@ sam3_auto_probe(struct flash_bank_s *bank) static int -sam3_erase(struct flash_bank_s *bank, int first, int last) +sam3_erase(struct flash_bank *bank, int first, int last) { struct sam3_bank_private *pPrivate; int r; @@ -1907,7 +1905,7 @@ sam3_erase(struct flash_bank_s *bank, int first, int last) } static int -sam3_protect(struct flash_bank_s *bank, int set, int first, int last) +sam3_protect(struct flash_bank *bank, int set, int first, int last) { struct sam3_bank_private *pPrivate; int r; @@ -1936,7 +1934,7 @@ sam3_protect(struct flash_bank_s *bank, int set, int first, int last) static int -sam3_info(flash_bank_t *bank, char *buf, int buf_size) +sam3_info(struct flash_bank *bank, char *buf, int buf_size) { if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); @@ -2104,7 +2102,7 @@ sam3_page_write(struct sam3_bank_private *pPrivate, unsigned pagenum, uint8_t *b static int -sam3_write(struct flash_bank_s *bank, +sam3_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) @@ -2367,7 +2365,7 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command) } - switch (argc) { + switch (CMD_ARGC) { default: command_print(cmd_ctx,"Too many parameters\n"); return ERROR_COMMAND_SYNTAX_ERROR; @@ -2380,17 +2378,17 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command) who = -1; break; case 2: - if ((0 == strcmp(args[0], "show")) && (0 == strcmp(args[1], "all"))) { + if ((0 == strcmp(CMD_ARGV[0], "show")) && (0 == strcmp(CMD_ARGV[1], "all"))) { who = -1; } else { uint32_t v32; - COMMAND_PARSE_NUMBER(u32, args[1], v32); + COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], v32); who = v32; } break; } - if (0 == strcmp("show", args[0])) { + if (0 == strcmp("show", CMD_ARGV[0])) { if (who == -1) { showall: r = ERROR_OK; @@ -2418,13 +2416,13 @@ COMMAND_HANDLER(sam3_handle_gpnvm_command) return ERROR_COMMAND_SYNTAX_ERROR; } - if (0 == strcmp("set", args[0])) { + if (0 == strcmp("set", CMD_ARGV[0])) { r = FLASHD_SetGPNVM(&(pChip->details.bank[0]), who); - } else if ((0 == strcmp("clr", args[0])) || - (0 == strcmp("clear", args[0]))) { // quietly accept both + } else if ((0 == strcmp("clr", CMD_ARGV[0])) || + (0 == strcmp("clear", CMD_ARGV[0]))) { // quietly accept both r = FLASHD_ClrGPNVM(&(pChip->details.bank[0]), who); } else { - command_print(cmd_ctx, "Unkown command: %s", args[0]); + command_print(cmd_ctx, "Unkown command: %s", CMD_ARGV[0]); r = ERROR_COMMAND_SYNTAX_ERROR; } return r; @@ -2440,7 +2438,7 @@ COMMAND_HANDLER(sam3_handle_slowclk_command) } - switch (argc) { + switch (CMD_ARGC) { case 0: // show break; @@ -2448,7 +2446,7 @@ COMMAND_HANDLER(sam3_handle_slowclk_command) { // set uint32_t v; - COMMAND_PARSE_NUMBER(u32, args[0], v); + COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], v); if (v > 200000) { // absurd slow clock of 200Khz? command_print(cmd_ctx,"Absurd/illegal slow clock freq: %d\n", (int)(v)); @@ -2472,9 +2470,9 @@ COMMAND_HANDLER(sam3_handle_slowclk_command) static int sam3_registered; static int -sam3_register_commands(struct command_context_s *cmd_ctx) +sam3_register_commands(struct command_context *cmd_ctx) { - command_t *pCmd; + struct command *pCmd; // only register once if (!sam3_registered) {