From 0e3b50d20da8559af24ecb28042ea52c09b7df6a Mon Sep 17 00:00:00 2001 From: dragonmux Date: Sat, 13 Jan 2024 07:50:40 +0000 Subject: [PATCH] hosted/cmsis_dap: Fixed the nomenclature for `dap_dp_raw_access` --- src/platforms/hosted/cmsis_dap.c | 6 +++--- src/platforms/hosted/dap.h | 2 +- src/platforms/hosted/dap_jtag.c | 2 +- src/platforms/hosted/dap_swd.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/platforms/hosted/cmsis_dap.c b/src/platforms/hosted/cmsis_dap.c index 89f6e92cdbd..4cc6e70dbfb 100644 --- a/src/platforms/hosted/cmsis_dap.c +++ b/src/platforms/hosted/cmsis_dap.c @@ -386,7 +386,7 @@ void dap_dp_abort(adiv5_debug_port_s *const target_dp, const uint32_t abort) dap_write_reg(target_dp, ADIV5_DP_ABORT, abort); } -uint32_t dap_dp_low_access( +uint32_t dap_dp_raw_access( adiv5_debug_port_s *const target_dp, const uint8_t rnw, const uint16_t addr, const uint32_t value) { const bool APnDP = addr & ADIV5_APnDP; @@ -401,11 +401,11 @@ uint32_t dap_dp_low_access( uint32_t dap_dp_read_reg(adiv5_debug_port_s *const target_dp, const uint16_t addr) { - uint32_t result = dap_dp_low_access(target_dp, ADIV5_LOW_READ, addr, 0); + uint32_t result = dap_dp_raw_access(target_dp, ADIV5_LOW_READ, addr, 0); if (target_dp->fault == DAP_TRANSFER_NO_RESPONSE) { DEBUG_WARN("Recovering and re-trying access\n"); target_dp->error(target_dp, true); - result = dap_dp_low_access(target_dp, ADIV5_LOW_READ, addr, 0); + result = dap_dp_raw_access(target_dp, ADIV5_LOW_READ, addr, 0); } DEBUG_PROBE("dp_read %04x %08" PRIx32 "\n", addr, result); return result; diff --git a/src/platforms/hosted/dap.h b/src/platforms/hosted/dap.h index ce3d5df09cb..90b8dfac3d3 100644 --- a/src/platforms/hosted/dap.h +++ b/src/platforms/hosted/dap.h @@ -90,7 +90,7 @@ bool dap_run_cmd(const void *request_data, size_t request_length, void *response bool dap_jtag_configure(void); void dap_dp_abort(adiv5_debug_port_s *target_dp, uint32_t abort); -uint32_t dap_dp_low_access(adiv5_debug_port_s *target_dp, uint8_t rnw, uint16_t addr, uint32_t value); +uint32_t dap_dp_raw_access(adiv5_debug_port_s *target_dp, uint8_t rnw, uint16_t addr, uint32_t value); uint32_t dap_dp_read_reg(adiv5_debug_port_s *target_dp, uint16_t addr); #endif /* PLATFORMS_HOSTED_DAP_H */ diff --git a/src/platforms/hosted/dap_jtag.c b/src/platforms/hosted/dap_jtag.c index 09738aa36d5..1590a9f1567 100644 --- a/src/platforms/hosted/dap_jtag.c +++ b/src/platforms/hosted/dap_jtag.c @@ -80,7 +80,7 @@ void dap_jtag_dp_init(adiv5_debug_port_s *target_dp) if (!dap_jtag_configure()) return; target_dp->dp_read = dap_dp_read_reg; - target_dp->low_access = dap_dp_low_access; + target_dp->low_access = dap_dp_raw_access; target_dp->abort = dap_dp_abort; } diff --git a/src/platforms/hosted/dap_swd.c b/src/platforms/hosted/dap_swd.c index b6a496ef08f..c85ba45d200 100644 --- a/src/platforms/hosted/dap_swd.c +++ b/src/platforms/hosted/dap_swd.c @@ -84,7 +84,7 @@ bool dap_swd_init(adiv5_debug_port_s *target_dp) /* Set up the accelerated SWD functions for basic target operations */ target_dp->read_no_check = dap_read_reg_no_check; target_dp->dp_read = dap_dp_read_reg; - target_dp->low_access = dap_dp_low_access; + target_dp->low_access = dap_dp_raw_access; target_dp->abort = dap_dp_abort; return true; }