interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target: rewrite command 'arp_reset' as COMMAND_HANDLER 

While there, add the missing .usage field and move in target.c the
enum nvp_assert.

Change-Id: Ia4f2f962887b5a35faeaa4eae128fa2865569b24
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7559
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2023-03-27 11:11:46 +02:00
parent b931286ab4
commit 85b5c51806
2 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/target/target.c
View File

@ -157,7 +157,12 @@ static LIST_HEAD(target_trace_callback_list);
static const int polling_interval = TARGET_DEFAULT_POLLING_INTERVAL; static const int polling_interval = TARGET_DEFAULT_POLLING_INTERVAL;
static LIST_HEAD(empty_smp_targets); static LIST_HEAD(empty_smp_targets);
static const struct jim_nvp nvp_assert[] = { enum nvp_assert {
NVP_DEASSERT,
NVP_ASSERT,
};
static const struct nvp nvp_assert[] = {
{ .name = "assert", NVP_ASSERT }, { .name = "assert", NVP_ASSERT },
{ .name = "deassert", NVP_DEASSERT }, { .name = "deassert", NVP_DEASSERT },
{ .name = "T", NVP_ASSERT }, { .name = "T", NVP_ASSERT },
@ -5770,40 +5775,30 @@ COMMAND_HANDLER(handle_target_poll)
return target->type->poll(target); return target->type->poll(target);
} }
static int jim_target_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv) COMMAND_HANDLER(handle_target_reset)
{ {
struct jim_getopt_info goi; if (CMD_ARGC != 2)
jim_getopt_setup(&goi, interp, argc - 1, argv + 1); return ERROR_COMMAND_SYNTAX_ERROR;
if (goi.argc != 2) { const struct nvp *n = nvp_name2value(nvp_assert, CMD_ARGV[0]);
Jim_WrongNumArgs(interp, 0, argv, if (!n->name) {
"([tT]|[fF]|assert|deassert) BOOL"); nvp_unknown_command_print(CMD, nvp_assert, NULL, CMD_ARGV[0]);
return JIM_ERR; return ERROR_COMMAND_ARGUMENT_INVALID;
} }
struct jim_nvp *n;
int e = jim_getopt_nvp(&goi, nvp_assert, &n);
if (e != JIM_OK) {
jim_getopt_nvp_unknown(&goi, nvp_assert, 1);
return e;
}
/* the halt or not param */ /* the halt or not param */
jim_wide a; int a;
e = jim_getopt_wide(&goi, &a); COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], a);
if (e != JIM_OK)
return e;
struct command_context *cmd_ctx = current_command_context(interp); struct target *target = get_current_target(CMD_CTX);
assert(cmd_ctx); if (!target->tap->enabled) {
struct target *target = get_current_target(cmd_ctx); command_print(CMD, "[TAP is disabled]");
if (!target->tap->enabled) return ERROR_FAIL;
return jim_target_tap_disabled(interp); }
if (!target->type->assert_reset || !target->type->deassert_reset) { if (!target->type->assert_reset || !target->type->deassert_reset) {
Jim_SetResultFormatted(interp, command_print(CMD, "No target-specific reset for %s", target_name(target));
"No target-specific reset for %s", return ERROR_FAIL;
target_name(target));
return JIM_ERR;
} }
if (target->defer_examine) if (target->defer_examine)
@ -5816,10 +5811,8 @@ static int jim_target_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
/* do the assert */ /* do the assert */
if (n->value == NVP_ASSERT) if (n->value == NVP_ASSERT)
e = target->type->assert_reset(target); return target->type->assert_reset(target);
else return target->type->deassert_reset(target);
e = target->type->deassert_reset(target);
return (e == ERROR_OK) ? JIM_OK : JIM_ERR;
} }
COMMAND_HANDLER(handle_target_halt) COMMAND_HANDLER(handle_target_halt)
@ -6101,8 +6094,9 @@ static const struct command_registration target_instance_command_handlers[] = {
{ {
.name = "arp_reset", .name = "arp_reset",
.mode = COMMAND_EXEC, .mode = COMMAND_EXEC,
.jim_handler = jim_target_reset, .handler = handle_target_reset,
.help = "used internally for reset processing", .help = "used internally for reset processing",
.usage = "'assert'|'deassert' halt",
}, },
{ {
.name = "arp_halt", .name = "arp_halt",

5
src/target/target.h
View File

@ -57,11 +57,6 @@ enum target_state {
TARGET_DEBUG_RUNNING = 4, TARGET_DEBUG_RUNNING = 4,
}; };
enum nvp_assert {
NVP_DEASSERT,
NVP_ASSERT,
};
enum target_reset_mode { enum target_reset_mode {
RESET_UNKNOWN = 0, RESET_UNKNOWN = 0,
RESET_RUN = 1, /* reset and let target run */ RESET_RUN = 1, /* reset and let target run */