auracaster/sw_openocd
3
0
Fork 0
forked from auracaster/openocd
Code Pull Requests Activity

target/dsp5680xx: cleanup code confusing cppcheck

Browse Source 
1. Add check of target pointer in dsp5680xx_irscan().
2. Replace some calls to err_check().

The calls to err_check() were confusing cppcheck.
The changes are not strictly required but I think they are more
readable.

Change-Id: I9c144143254c8e153cc7848094994ea9f769f4ff
Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
Reviewed-on: https://review.openocd.org/c/openocd/+/9504
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Tested-by: jenkins
This commit is contained in:
Mark O'Donovan
2026-02-24 21:55:37 +00:00
committed by Antonio Borneo
parent b8cfd06368
commit 48f57a72ce
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/target/dsp5680xx.c
View File

@@ -19,6 +19,7 @@
static struct dsp5680xx_common dsp5680xx_context; static struct dsp5680xx_common dsp5680xx_context;
#define _E "DSP5680XX_ERROR:%d\nAt:%s:%d:%s" #define _E "DSP5680XX_ERROR:%d\nAt:%s:%d:%s"
#define err_log(c, m) LOG_ERROR(_E, c, __func__, __LINE__, m)
#define err_check(r, c, m) if (r != ERROR_OK) {LOG_ERROR(_E, c, __func__, __LINE__, m); return r; } #define err_check(r, c, m) if (r != ERROR_OK) {LOG_ERROR(_E, c, __func__, __LINE__, m); return r; }
#define err_check_propagate(retval) if (retval != ERROR_OK) return retval; #define err_check_propagate(retval) if (retval != ERROR_OK) return retval;
#define DEBUG_MSG "Debug mode be enabled to read mem." #define DEBUG_MSG "Debug mode be enabled to read mem."
@@ -116,10 +117,9 @@ static int dsp5680xx_irscan(struct target *target, uint32_t *d_in,
uint16_t tap_ir_len = DSP5680XX_JTAG_MASTER_TAP_IRLEN; uint16_t tap_ir_len = DSP5680XX_JTAG_MASTER_TAP_IRLEN;
if (!target->tap) { if (!target || !target->tap) {
retval = ERROR_FAIL; err_log(DSP5680XX_ERROR_JTAG_INVALID_TAP, "Invalid tap");
err_check(retval, DSP5680XX_ERROR_JTAG_INVALID_TAP, return ERROR_FAIL;
"Invalid tap");
} }
if (ir_len != target->tap->ir_length) { if (ir_len != target->tap->ir_length) {
if (target->tap->enabled) { if (target->tap->enabled) {
@@ -579,9 +579,9 @@ static int switch_tap(struct target *target, struct jtag_tap *master_tap,
if (!core_tap) { if (!core_tap) {
core_tap = jtag_tap_by_string("dsp568013.cpu"); core_tap = jtag_tap_by_string("dsp568013.cpu");
if (!core_tap) { if (!core_tap) {
retval = ERROR_FAIL; err_log(DSP5680XX_ERROR_JTAG_TAP_FIND_CORE,
err_check(retval, DSP5680XX_ERROR_JTAG_TAP_FIND_CORE,
"Failed to get core tap."); "Failed to get core tap.");
return ERROR_FAIL;
} }
} }
@@ -727,9 +727,9 @@ static int eonce_enter_debug_mode(struct target *target,
} }
tap_cpu = jtag_tap_by_string("dsp568013.cpu"); tap_cpu = jtag_tap_by_string("dsp568013.cpu");
if (!tap_cpu) { if (!tap_cpu) {
retval = ERROR_FAIL; err_log(DSP5680XX_ERROR_JTAG_TAP_FIND_CORE,
err_check(retval, DSP5680XX_ERROR_JTAG_TAP_FIND_CORE,
"Failed to get master tap."); "Failed to get master tap.");
return ERROR_FAIL;
} }
/* Enable master tap */ /* Enable master tap */
tap_chp->enabled = true; tap_chp->enabled = true;
@@ -2222,9 +2222,9 @@ int dsp5680xx_f_lock(struct target *target)
} }
tap_cpu = jtag_tap_by_string("dsp568013.cpu"); tap_cpu = jtag_tap_by_string("dsp568013.cpu");
if (!tap_cpu) { if (!tap_cpu) {
retval = ERROR_FAIL; err_log(DSP5680XX_ERROR_JTAG_TAP_ENABLE_CORE,
err_check(retval, DSP5680XX_ERROR_JTAG_TAP_ENABLE_CORE,
"Failed to get master tap."); "Failed to get master tap.");
return ERROR_FAIL;
} }
target->state = TARGET_RUNNING; target->state = TARGET_RUNNING;
dsp5680xx_context.debug_mode_enabled = false; dsp5680xx_context.debug_mode_enabled = false;
@@ -2237,8 +2237,9 @@ int dsp5680xx_f_lock(struct target *target)
static int dsp5680xx_step(struct target *target, bool current, target_addr_t address, static int dsp5680xx_step(struct target *target, bool current, target_addr_t address,
bool handle_breakpoints) bool handle_breakpoints)
{ {
err_check(ERROR_FAIL, DSP5680XX_ERROR_NOT_IMPLEMENTED_STEP, err_log(DSP5680XX_ERROR_NOT_IMPLEMENTED_STEP,
"Not implemented yet."); "Not implemented yet.");
return ERROR_FAIL;
} }
/** Holds methods for dsp5680xx targets. */ /** Holds methods for dsp5680xx targets. */