diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2015-12-06 17:16:31 +0100 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2015-12-29 20:32:10 +0000 |
| commit | e7d165f3dbff0fbe11f458becdccbb3d4fa8ccc4 (patch) | |
| tree | 1277356692c41400ff7d5c237c413170c556e430 /src/flash/nor/kinetis.c | |
| parent | d84c7d91960bbba0079268d165f0bb29a0da4d86 (diff) | |
| download | riscv-openocd-e7d165f3dbff0fbe11f458becdccbb3d4fa8ccc4.zip riscv-openocd-e7d165f3dbff0fbe11f458becdccbb3d4fa8ccc4.tar.gz riscv-openocd-e7d165f3dbff0fbe11f458becdccbb3d4fa8ccc4.tar.bz2 | |
arm_adi_v5: Remove all cases of "restoring" previous dap_ap_select()
All AP operations should select the AP to use before calling it so
there's no point in restoring the previous value afterwards.
The explicit call to dap_ap_select() before all AP operations should be
moved into dap_queue_ap_read/write() which then would have to take the
AP as an argument instead of the DAP.
Change-Id: Icacb0c76ef2a5ac36b4d2f26b52ec01a8850286e
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/3156
Tested-by: jenkins
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
Diffstat (limited to 'src/flash/nor/kinetis.c')
| -rw-r--r-- | src/flash/nor/kinetis.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c index 1795279..c248b05 100644 --- a/src/flash/nor/kinetis.c +++ b/src/flash/nor/kinetis.c @@ -245,6 +245,8 @@ static int kinetis_mdm_write_register(struct adiv5_dap *dap, unsigned reg, uint3 int retval; LOG_DEBUG("MDM_REG[0x%02x] <- %08" PRIX32, reg, value); + dap_ap_select(dap, 1); + retval = dap_queue_ap_write(dap, reg, value); if (retval != ERROR_OK) { LOG_DEBUG("MDM: failed to queue a write request"); @@ -264,6 +266,9 @@ static int kinetis_mdm_write_register(struct adiv5_dap *dap, unsigned reg, uint3 static int kinetis_mdm_read_register(struct adiv5_dap *dap, unsigned reg, uint32_t *result) { int retval; + + dap_ap_select(dap, 1); + retval = dap_queue_ap_read(dap, reg, result); if (retval != ERROR_OK) { LOG_DEBUG("MDM: failed to queue a read request"); @@ -316,7 +321,6 @@ COMMAND_HANDLER(kinetis_mdm_mass_erase) } int retval; - const uint8_t original_ap = dap_ap_get_select(dap); /* * ... Power on the processor, or if power has already been @@ -333,8 +337,6 @@ COMMAND_HANDLER(kinetis_mdm_mass_erase) LOG_WARNING("Attempting mass erase without hardware reset. This is not reliable; " "it's recommended you connect SRST and use ``reset_config srst_only''."); - dap_ap_select(dap, 1); - retval = kinetis_mdm_write_register(dap, MDM_REG_CTRL, MEM_CTRL_SYS_RES_REQ); if (retval != ERROR_OK) return retval; @@ -384,8 +386,6 @@ COMMAND_HANDLER(kinetis_mdm_mass_erase) if (retval != ERROR_OK) return retval; - dap_ap_select(dap, original_ap); - if (jtag_get_reset_config() & RESET_HAS_SRST) { /* halt MCU otherwise it loops in hard fault - WDOG reset cycle */ target->reset_halt = true; @@ -420,10 +420,6 @@ COMMAND_HANDLER(kinetis_check_flash_security_status) uint32_t val; int retval; - const uint8_t origninal_ap = dap_ap_get_select(dap); - - dap_ap_select(dap, 1); - /* * ... The MDM-AP ID register can be read to verify that the @@ -474,7 +470,6 @@ COMMAND_HANDLER(kinetis_check_flash_security_status) LOG_WARNING("MDM: Secured MCU state detected however it may be a false alarm"); LOG_WARNING("MDM: Halting target to detect secured state reliably"); - dap_ap_select(dap, origninal_ap); retval = target_halt(target); if (retval == ERROR_OK) retval = target_wait_state(target, TARGET_HALTED, 100); @@ -487,7 +482,6 @@ COMMAND_HANDLER(kinetis_check_flash_security_status) } /* re-read status */ - dap_ap_select(dap, 1); retval = kinetis_mdm_read_register(dap, MDM_REG_STAT, &val); if (retval != ERROR_OK) { LOG_ERROR("MDM: failed to read MDM_REG_STAT"); @@ -512,8 +506,6 @@ COMMAND_HANDLER(kinetis_check_flash_security_status) jtag_poll_set_enabled(true); } - dap_ap_select(dap, origninal_ap); - return ERROR_OK; fail: |