helper/jim-nvp: comply with coding style [2/2]
With the API fixed to comply with OpenOCD coding style, fix all
the references in the code.
Patch generated automatically with the script below.
The list is in reverse order to replace a common prefix after the
replacement of the symbols with the same prefix.
%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---
(cat << EOF
Jim_SetResult_NvpUnknown jim_set_result_nvp_unknown
Jim_Nvp_value2name_simple jim_nvp_value2name_simple
Jim_Nvp_value2name_obj jim_nvp_value2name_obj
Jim_Nvp_value2name jim_nvp_value2name
Jim_Nvp_name2value_simple jim_nvp_name2value_simple
Jim_Nvp_name2value_obj_nocase jim_nvp_name2value_obj_nocase
Jim_Nvp_name2value_obj jim_nvp_name2value_obj
Jim_Nvp_name2value_nocase_simple jim_nvp_name2value_nocase_simple
Jim_Nvp_name2value_nocase jim_nvp_name2value_nocase
Jim_Nvp_name2value jim_nvp_name2value
Jim_Nvp struct jim_nvp
Jim_GetOpt_Wide jim_getopt_wide
Jim_GetOpt_String jim_getopt_string
Jim_GetOpt_Setup jim_getopt_setup
Jim_GetOpt_Obj jim_getopt_obj
Jim_GetOpt_NvpUnknown jim_getopt_nvp_unknown
Jim_GetOpt_Nvp jim_getopt_nvp
Jim_GetOpt_Enum jim_getopt_enum
Jim_GetOpt_Double jim_getopt_double
Jim_GetOpt_Debug jim_getopt_debug
Jim_GetOptInfo struct jim_getopt_info
Jim_GetNvp jim_get_nvp
Jim_Debug_ArgvString jim_debug_argv_string
EOF
) | while read a b; do
sed -i "s/$a/$b/g" $(find src -type f ! -name jim-nvp.\? )
done
%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---%<---
Change-Id: I10a12bd64bb8b17575fd9150482c989c92b298a2
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6184
Reviewed-by: Marc Schink <dev@zapb.de>
Tested-by: jenkins
This commit is contained in:
@@ -158,7 +158,7 @@ static LIST_HEAD(target_reset_callback_list);
|
||||
static LIST_HEAD(target_trace_callback_list);
|
||||
static const int polling_interval = 100;
|
||||
|
||||
static const Jim_Nvp nvp_assert[] = {
|
||||
static const struct jim_nvp nvp_assert[] = {
|
||||
{ .name = "assert", NVP_ASSERT },
|
||||
{ .name = "deassert", NVP_DEASSERT },
|
||||
{ .name = "T", NVP_ASSERT },
|
||||
@@ -168,7 +168,7 @@ static const Jim_Nvp nvp_assert[] = {
|
||||
{ .name = NULL, .value = -1 }
|
||||
};
|
||||
|
||||
static const Jim_Nvp nvp_error_target[] = {
|
||||
static const struct jim_nvp nvp_error_target[] = {
|
||||
{ .value = ERROR_TARGET_INVALID, .name = "err-invalid" },
|
||||
{ .value = ERROR_TARGET_INIT_FAILED, .name = "err-init-failed" },
|
||||
{ .value = ERROR_TARGET_TIMEOUT, .name = "err-timeout" },
|
||||
@@ -185,16 +185,16 @@ static const Jim_Nvp nvp_error_target[] = {
|
||||
|
||||
static const char *target_strerror_safe(int err)
|
||||
{
|
||||
const Jim_Nvp *n;
|
||||
const struct jim_nvp *n;
|
||||
|
||||
n = Jim_Nvp_value2name_simple(nvp_error_target, err);
|
||||
n = jim_nvp_value2name_simple(nvp_error_target, err);
|
||||
if (n->name == NULL)
|
||||
return "unknown";
|
||||
else
|
||||
return n->name;
|
||||
}
|
||||
|
||||
static const Jim_Nvp nvp_target_event[] = {
|
||||
static const struct jim_nvp nvp_target_event[] = {
|
||||
|
||||
{ .value = TARGET_EVENT_GDB_HALT, .name = "gdb-halt" },
|
||||
{ .value = TARGET_EVENT_HALTED, .name = "halted" },
|
||||
@@ -237,7 +237,7 @@ static const Jim_Nvp nvp_target_event[] = {
|
||||
{ .name = NULL, .value = -1 }
|
||||
};
|
||||
|
||||
static const Jim_Nvp nvp_target_state[] = {
|
||||
static const struct jim_nvp nvp_target_state[] = {
|
||||
{ .name = "unknown", .value = TARGET_UNKNOWN },
|
||||
{ .name = "running", .value = TARGET_RUNNING },
|
||||
{ .name = "halted", .value = TARGET_HALTED },
|
||||
@@ -246,7 +246,7 @@ static const Jim_Nvp nvp_target_state[] = {
|
||||
{ .name = NULL, .value = -1 },
|
||||
};
|
||||
|
||||
static const Jim_Nvp nvp_target_debug_reason[] = {
|
||||
static const struct jim_nvp nvp_target_debug_reason[] = {
|
||||
{ .name = "debug-request", .value = DBG_REASON_DBGRQ },
|
||||
{ .name = "breakpoint", .value = DBG_REASON_BREAKPOINT },
|
||||
{ .name = "watchpoint", .value = DBG_REASON_WATCHPOINT },
|
||||
@@ -259,7 +259,7 @@ static const Jim_Nvp nvp_target_debug_reason[] = {
|
||||
{ .name = NULL, .value = -1 },
|
||||
};
|
||||
|
||||
static const Jim_Nvp nvp_target_endian[] = {
|
||||
static const struct jim_nvp nvp_target_endian[] = {
|
||||
{ .name = "big", .value = TARGET_BIG_ENDIAN },
|
||||
{ .name = "little", .value = TARGET_LITTLE_ENDIAN },
|
||||
{ .name = "be", .value = TARGET_BIG_ENDIAN },
|
||||
@@ -267,7 +267,7 @@ static const Jim_Nvp nvp_target_endian[] = {
|
||||
{ .name = NULL, .value = -1 },
|
||||
};
|
||||
|
||||
static const Jim_Nvp nvp_reset_modes[] = {
|
||||
static const struct jim_nvp nvp_reset_modes[] = {
|
||||
{ .name = "unknown", .value = RESET_UNKNOWN },
|
||||
{ .name = "run", .value = RESET_RUN },
|
||||
{ .name = "halt", .value = RESET_HALT },
|
||||
@@ -279,7 +279,7 @@ const char *debug_reason_name(struct target *t)
|
||||
{
|
||||
const char *cp;
|
||||
|
||||
cp = Jim_Nvp_value2name_simple(nvp_target_debug_reason,
|
||||
cp = jim_nvp_value2name_simple(nvp_target_debug_reason,
|
||||
t->debug_reason)->name;
|
||||
if (!cp) {
|
||||
LOG_ERROR("Invalid debug reason: %d", (int)(t->debug_reason));
|
||||
@@ -291,7 +291,7 @@ const char *debug_reason_name(struct target *t)
|
||||
const char *target_state_name(struct target *t)
|
||||
{
|
||||
const char *cp;
|
||||
cp = Jim_Nvp_value2name_simple(nvp_target_state, t->state)->name;
|
||||
cp = jim_nvp_value2name_simple(nvp_target_state, t->state)->name;
|
||||
if (!cp) {
|
||||
LOG_ERROR("Invalid target state: %d", (int)(t->state));
|
||||
cp = "(*BUG*unknown*BUG*)";
|
||||
@@ -306,7 +306,7 @@ const char *target_state_name(struct target *t)
|
||||
const char *target_event_name(enum target_event event)
|
||||
{
|
||||
const char *cp;
|
||||
cp = Jim_Nvp_value2name_simple(nvp_target_event, event)->name;
|
||||
cp = jim_nvp_value2name_simple(nvp_target_event, event)->name;
|
||||
if (!cp) {
|
||||
LOG_ERROR("Invalid target event: %d", (int)(event));
|
||||
cp = "(*BUG*unknown*BUG*)";
|
||||
@@ -317,7 +317,7 @@ const char *target_event_name(enum target_event event)
|
||||
const char *target_reset_mode_name(enum target_reset_mode reset_mode)
|
||||
{
|
||||
const char *cp;
|
||||
cp = Jim_Nvp_value2name_simple(nvp_reset_modes, reset_mode)->name;
|
||||
cp = jim_nvp_value2name_simple(nvp_reset_modes, reset_mode)->name;
|
||||
if (!cp) {
|
||||
LOG_ERROR("Invalid target reset mode: %d", (int)(reset_mode));
|
||||
cp = "(*BUG*unknown*BUG*)";
|
||||
@@ -661,8 +661,8 @@ static int target_process_reset(struct command_invocation *cmd, enum target_rese
|
||||
{
|
||||
char buf[100];
|
||||
int retval;
|
||||
Jim_Nvp *n;
|
||||
n = Jim_Nvp_value2name_simple(nvp_reset_modes, reset_mode);
|
||||
struct jim_nvp *n;
|
||||
n = jim_nvp_value2name_simple(nvp_reset_modes, reset_mode);
|
||||
if (n->name == NULL) {
|
||||
LOG_ERROR("invalid reset mode");
|
||||
return ERROR_FAIL;
|
||||
@@ -1823,7 +1823,7 @@ int target_call_event_callbacks(struct target *target, enum target_event event)
|
||||
}
|
||||
|
||||
LOG_DEBUG("target event %i (%s) for core %s", event,
|
||||
Jim_Nvp_value2name_simple(nvp_target_event, event)->name,
|
||||
jim_nvp_value2name_simple(nvp_target_event, event)->name,
|
||||
target_name(target));
|
||||
|
||||
target_handle_event(target, event);
|
||||
@@ -1842,7 +1842,7 @@ int target_call_reset_callbacks(struct target *target, enum target_reset_mode re
|
||||
struct target_reset_callback *callback;
|
||||
|
||||
LOG_DEBUG("target reset %i (%s)", reset_mode,
|
||||
Jim_Nvp_value2name_simple(nvp_reset_modes, reset_mode)->name);
|
||||
jim_nvp_value2name_simple(nvp_reset_modes, reset_mode)->name);
|
||||
|
||||
list_for_each_entry(callback, &target_reset_callback_list, list)
|
||||
callback->callback(target, reset_mode, callback->priv);
|
||||
@@ -2859,7 +2859,7 @@ COMMAND_HANDLER(handle_targets_command)
|
||||
marker,
|
||||
target_name(target),
|
||||
target_type_name(target),
|
||||
Jim_Nvp_value2name_simple(nvp_target_endian,
|
||||
jim_nvp_value2name_simple(nvp_target_endian,
|
||||
target->endianness)->name,
|
||||
target->tap->dotted_name,
|
||||
state);
|
||||
@@ -3239,7 +3239,7 @@ int target_wait_state(struct target *target, enum target_state state, int ms)
|
||||
once = false;
|
||||
then = timeval_ms();
|
||||
LOG_DEBUG("waiting for target %s...",
|
||||
Jim_Nvp_value2name_simple(nvp_target_state, state)->name);
|
||||
jim_nvp_value2name_simple(nvp_target_state, state)->name);
|
||||
}
|
||||
|
||||
if (cur-then > 500)
|
||||
@@ -3247,7 +3247,7 @@ int target_wait_state(struct target *target, enum target_state state, int ms)
|
||||
|
||||
if ((cur-then) > ms) {
|
||||
LOG_ERROR("timed out while waiting for target %s",
|
||||
Jim_Nvp_value2name_simple(nvp_target_state, state)->name);
|
||||
jim_nvp_value2name_simple(nvp_target_state, state)->name);
|
||||
return ERROR_FAIL;
|
||||
}
|
||||
}
|
||||
@@ -3297,8 +3297,8 @@ COMMAND_HANDLER(handle_reset_command)
|
||||
|
||||
enum target_reset_mode reset_mode = RESET_RUN;
|
||||
if (CMD_ARGC == 1) {
|
||||
const Jim_Nvp *n;
|
||||
n = Jim_Nvp_name2value_simple(nvp_reset_modes, CMD_ARGV[0]);
|
||||
const struct jim_nvp *n;
|
||||
n = jim_nvp_name2value_simple(nvp_reset_modes, CMD_ARGV[0]);
|
||||
if ((n->name == NULL) || (n->value == RESET_UNKNOWN))
|
||||
return ERROR_COMMAND_SYNTAX_ERROR;
|
||||
reset_mode = n->value;
|
||||
@@ -4775,7 +4775,7 @@ void target_handle_event(struct target *target, enum target_event e)
|
||||
target_name(target),
|
||||
target_type_name(target),
|
||||
e,
|
||||
Jim_Nvp_value2name_simple(nvp_target_event, e)->name,
|
||||
jim_nvp_value2name_simple(nvp_target_event, e)->name,
|
||||
Jim_GetString(teap->body, NULL));
|
||||
|
||||
/* Override current target by the target an event
|
||||
@@ -4799,7 +4799,7 @@ void target_handle_event(struct target *target, enum target_event e)
|
||||
if (retval != JIM_OK) {
|
||||
Jim_MakeErrorMessage(teap->interp);
|
||||
LOG_USER("Error executing event %s on target %s:\n%s",
|
||||
Jim_Nvp_value2name_simple(nvp_target_event, e)->name,
|
||||
jim_nvp_value2name_simple(nvp_target_event, e)->name,
|
||||
target_name(target),
|
||||
Jim_GetString(Jim_GetResult(teap->interp), NULL));
|
||||
/* clean both error code and stacktrace before return */
|
||||
@@ -4840,7 +4840,7 @@ enum target_cfg_param {
|
||||
TCFG_GDB_MAX_CONNECTIONS,
|
||||
};
|
||||
|
||||
static Jim_Nvp nvp_config_opts[] = {
|
||||
static struct jim_nvp nvp_config_opts[] = {
|
||||
{ .name = "-type", .value = TCFG_TYPE },
|
||||
{ .name = "-event", .value = TCFG_EVENT },
|
||||
{ .name = "-work-area-virt", .value = TCFG_WORK_AREA_VIRT },
|
||||
@@ -4858,9 +4858,9 @@ static Jim_Nvp nvp_config_opts[] = {
|
||||
{ .name = NULL, .value = -1 }
|
||||
};
|
||||
|
||||
static int target_configure(Jim_GetOptInfo *goi, struct target *target)
|
||||
static int target_configure(struct jim_getopt_info *goi, struct target *target)
|
||||
{
|
||||
Jim_Nvp *n;
|
||||
struct jim_nvp *n;
|
||||
Jim_Obj *o;
|
||||
jim_wide w;
|
||||
int e;
|
||||
@@ -4868,7 +4868,7 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *target)
|
||||
/* parse config or cget options ... */
|
||||
while (goi->argc > 0) {
|
||||
Jim_SetEmptyResult(goi->interp);
|
||||
/* Jim_GetOpt_Debug(goi); */
|
||||
/* jim_getopt_debug(goi); */
|
||||
|
||||
if (target->type->target_jim_configure) {
|
||||
/* target defines a configure function */
|
||||
@@ -4884,9 +4884,9 @@ static int target_configure(Jim_GetOptInfo *goi, struct target *target)
|
||||
}
|
||||
/* otherwise we 'continue' below */
|
||||
}
|
||||
e = Jim_GetOpt_Nvp(goi, nvp_config_opts, &n);
|
||||
e = jim_getopt_nvp(goi, nvp_config_opts, &n);
|
||||
if (e != JIM_OK) {
|
||||
Jim_GetOpt_NvpUnknown(goi, nvp_config_opts, 0);
|
||||
jim_getopt_nvp_unknown(goi, nvp_config_opts, 0);
|
||||
return e;
|
||||
}
|
||||
switch (n->value) {
|
||||
@@ -4915,9 +4915,9 @@ no_params:
|
||||
return JIM_ERR;
|
||||
}
|
||||
|
||||
e = Jim_GetOpt_Nvp(goi, nvp_target_event, &n);
|
||||
e = jim_getopt_nvp(goi, nvp_target_event, &n);
|
||||
if (e != JIM_OK) {
|
||||
Jim_GetOpt_NvpUnknown(goi, nvp_target_event, 1);
|
||||
jim_getopt_nvp_unknown(goi, nvp_target_event, 1);
|
||||
return e;
|
||||
}
|
||||
|
||||
@@ -4958,7 +4958,7 @@ no_params:
|
||||
}
|
||||
teap->event = n->value;
|
||||
teap->interp = goi->interp;
|
||||
Jim_GetOpt_Obj(goi, &o);
|
||||
jim_getopt_obj(goi, &o);
|
||||
if (teap->body)
|
||||
Jim_DecrRefCount(teap->interp, teap->body);
|
||||
teap->body = Jim_DuplicateObj(goi->interp, o);
|
||||
@@ -4994,7 +4994,7 @@ no_params:
|
||||
case TCFG_WORK_AREA_VIRT:
|
||||
if (goi->isconfigure) {
|
||||
target_free_all_working_areas(target);
|
||||
e = Jim_GetOpt_Wide(goi, &w);
|
||||
e = jim_getopt_wide(goi, &w);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
target->working_area_virt = w;
|
||||
@@ -5010,7 +5010,7 @@ no_params:
|
||||
case TCFG_WORK_AREA_PHYS:
|
||||
if (goi->isconfigure) {
|
||||
target_free_all_working_areas(target);
|
||||
e = Jim_GetOpt_Wide(goi, &w);
|
||||
e = jim_getopt_wide(goi, &w);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
target->working_area_phys = w;
|
||||
@@ -5026,7 +5026,7 @@ no_params:
|
||||
case TCFG_WORK_AREA_SIZE:
|
||||
if (goi->isconfigure) {
|
||||
target_free_all_working_areas(target);
|
||||
e = Jim_GetOpt_Wide(goi, &w);
|
||||
e = jim_getopt_wide(goi, &w);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
target->working_area_size = w;
|
||||
@@ -5041,7 +5041,7 @@ no_params:
|
||||
case TCFG_WORK_AREA_BACKUP:
|
||||
if (goi->isconfigure) {
|
||||
target_free_all_working_areas(target);
|
||||
e = Jim_GetOpt_Wide(goi, &w);
|
||||
e = jim_getopt_wide(goi, &w);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
/* make this exactly 1 or 0 */
|
||||
@@ -5057,9 +5057,9 @@ no_params:
|
||||
|
||||
case TCFG_ENDIAN:
|
||||
if (goi->isconfigure) {
|
||||
e = Jim_GetOpt_Nvp(goi, nvp_target_endian, &n);
|
||||
e = jim_getopt_nvp(goi, nvp_target_endian, &n);
|
||||
if (e != JIM_OK) {
|
||||
Jim_GetOpt_NvpUnknown(goi, nvp_target_endian, 1);
|
||||
jim_getopt_nvp_unknown(goi, nvp_target_endian, 1);
|
||||
return e;
|
||||
}
|
||||
target->endianness = n->value;
|
||||
@@ -5067,10 +5067,10 @@ no_params:
|
||||
if (goi->argc != 0)
|
||||
goto no_params;
|
||||
}
|
||||
n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness);
|
||||
n = jim_nvp_value2name_simple(nvp_target_endian, target->endianness);
|
||||
if (n->name == NULL) {
|
||||
target->endianness = TARGET_LITTLE_ENDIAN;
|
||||
n = Jim_Nvp_value2name_simple(nvp_target_endian, target->endianness);
|
||||
n = jim_nvp_value2name_simple(nvp_target_endian, target->endianness);
|
||||
}
|
||||
Jim_SetResultString(goi->interp, n->name, -1);
|
||||
/* loop for more */
|
||||
@@ -5078,7 +5078,7 @@ no_params:
|
||||
|
||||
case TCFG_COREID:
|
||||
if (goi->isconfigure) {
|
||||
e = Jim_GetOpt_Wide(goi, &w);
|
||||
e = jim_getopt_wide(goi, &w);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
target->coreid = (int32_t)w;
|
||||
@@ -5102,7 +5102,7 @@ no_params:
|
||||
}
|
||||
|
||||
target_free_all_working_areas(target);
|
||||
e = Jim_GetOpt_Obj(goi, &o_t);
|
||||
e = jim_getopt_obj(goi, &o_t);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
tap = jtag_tap_by_jim_obj(goi->interp, o_t);
|
||||
@@ -5119,7 +5119,7 @@ no_params:
|
||||
break;
|
||||
case TCFG_DBGBASE:
|
||||
if (goi->isconfigure) {
|
||||
e = Jim_GetOpt_Wide(goi, &w);
|
||||
e = jim_getopt_wide(goi, &w);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
target->dbgbase = (uint32_t)w;
|
||||
@@ -5156,7 +5156,7 @@ no_params:
|
||||
}
|
||||
|
||||
const char *s;
|
||||
e = Jim_GetOpt_String(goi, &s, NULL);
|
||||
e = jim_getopt_string(goi, &s, NULL);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
free(target->gdb_port_override);
|
||||
@@ -5177,7 +5177,7 @@ no_params:
|
||||
return JIM_ERR;
|
||||
}
|
||||
|
||||
e = Jim_GetOpt_Wide(goi, &w);
|
||||
e = jim_getopt_wide(goi, &w);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
target->gdb_max_connections = (w < 0) ? CONNECTION_LIMIT_UNLIMITED : (int)w;
|
||||
@@ -5198,9 +5198,9 @@ no_params:
|
||||
static int jim_target_configure(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
|
||||
{
|
||||
struct command *c = jim_to_command(interp);
|
||||
Jim_GetOptInfo goi;
|
||||
struct jim_getopt_info goi;
|
||||
|
||||
Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
|
||||
jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
|
||||
goi.isconfigure = !strcmp(c->name, "configure");
|
||||
if (goi.argc < 1) {
|
||||
Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv,
|
||||
@@ -5241,8 +5241,8 @@ static int jim_target_examine(Jim_Interp *interp, int argc, Jim_Obj *const *argv
|
||||
{
|
||||
bool allow_defer = false;
|
||||
|
||||
Jim_GetOptInfo goi;
|
||||
Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
|
||||
struct jim_getopt_info goi;
|
||||
jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
|
||||
if (goi.argc > 1) {
|
||||
const char *cmd_name = Jim_GetString(argv[0], NULL);
|
||||
Jim_SetResultFormatted(goi.interp,
|
||||
@@ -5253,7 +5253,7 @@ static int jim_target_examine(Jim_Interp *interp, int argc, Jim_Obj *const *argv
|
||||
strcmp(Jim_GetString(argv[1], NULL), "allow-defer") == 0) {
|
||||
/* consume it */
|
||||
Jim_Obj *obj;
|
||||
int e = Jim_GetOpt_Obj(&goi, &obj);
|
||||
int e = jim_getopt_obj(&goi, &obj);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
allow_defer = true;
|
||||
@@ -5337,8 +5337,8 @@ static int jim_target_poll(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
|
||||
static int jim_target_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
Jim_GetOptInfo goi;
|
||||
Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
|
||||
struct jim_getopt_info goi;
|
||||
jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
|
||||
|
||||
if (goi.argc != 2) {
|
||||
Jim_WrongNumArgs(interp, 0, argv,
|
||||
@@ -5346,15 +5346,15 @@ static int jim_target_reset(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
return JIM_ERR;
|
||||
}
|
||||
|
||||
Jim_Nvp *n;
|
||||
int e = Jim_GetOpt_Nvp(&goi, nvp_assert, &n);
|
||||
struct jim_nvp *n;
|
||||
int e = jim_getopt_nvp(&goi, nvp_assert, &n);
|
||||
if (e != JIM_OK) {
|
||||
Jim_GetOpt_NvpUnknown(&goi, nvp_assert, 1);
|
||||
jim_getopt_nvp_unknown(&goi, nvp_assert, 1);
|
||||
return e;
|
||||
}
|
||||
/* the halt or not param */
|
||||
jim_wide a;
|
||||
e = Jim_GetOpt_Wide(&goi, &a);
|
||||
e = jim_getopt_wide(&goi, &a);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
|
||||
@@ -5404,8 +5404,8 @@ static int jim_target_halt(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
|
||||
static int jim_target_wait_state(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
Jim_GetOptInfo goi;
|
||||
Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
|
||||
struct jim_getopt_info goi;
|
||||
jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
|
||||
|
||||
/* params: <name> statename timeoutmsecs */
|
||||
if (goi.argc != 2) {
|
||||
@@ -5415,14 +5415,14 @@ static int jim_target_wait_state(Jim_Interp *interp, int argc, Jim_Obj *const *a
|
||||
return JIM_ERR;
|
||||
}
|
||||
|
||||
Jim_Nvp *n;
|
||||
int e = Jim_GetOpt_Nvp(&goi, nvp_target_state, &n);
|
||||
struct jim_nvp *n;
|
||||
int e = jim_getopt_nvp(&goi, nvp_target_state, &n);
|
||||
if (e != JIM_OK) {
|
||||
Jim_GetOpt_NvpUnknown(&goi, nvp_target_state, 1);
|
||||
jim_getopt_nvp_unknown(&goi, nvp_target_state, 1);
|
||||
return e;
|
||||
}
|
||||
jim_wide a;
|
||||
e = Jim_GetOpt_Wide(&goi, &a);
|
||||
e = jim_getopt_wide(&goi, &a);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
struct command_context *cmd_ctx = current_command_context(interp);
|
||||
@@ -5457,7 +5457,7 @@ COMMAND_HANDLER(handle_target_event_list)
|
||||
command_print(CMD, "------------------------- | "
|
||||
"----------------------------------------");
|
||||
while (teap) {
|
||||
Jim_Nvp *opt = Jim_Nvp_value2name_simple(nvp_target_event, teap->event);
|
||||
struct jim_nvp *opt = jim_nvp_value2name_simple(nvp_target_event, teap->event);
|
||||
command_print(CMD, "%-25s | %s",
|
||||
opt->name, Jim_GetString(teap->body, NULL));
|
||||
teap = teap->next;
|
||||
@@ -5479,17 +5479,17 @@ static int jim_target_current_state(Jim_Interp *interp, int argc, Jim_Obj *const
|
||||
}
|
||||
static int jim_target_invoke_event(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
Jim_GetOptInfo goi;
|
||||
Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
|
||||
struct jim_getopt_info goi;
|
||||
jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
|
||||
if (goi.argc != 1) {
|
||||
const char *cmd_name = Jim_GetString(argv[0], NULL);
|
||||
Jim_SetResultFormatted(goi.interp, "%s <eventname>", cmd_name);
|
||||
return JIM_ERR;
|
||||
}
|
||||
Jim_Nvp *n;
|
||||
int e = Jim_GetOpt_Nvp(&goi, nvp_target_event, &n);
|
||||
struct jim_nvp *n;
|
||||
int e = jim_getopt_nvp(&goi, nvp_target_event, &n);
|
||||
if (e != JIM_OK) {
|
||||
Jim_GetOpt_NvpUnknown(&goi, nvp_target_event, 1);
|
||||
jim_getopt_nvp_unknown(&goi, nvp_target_event, 1);
|
||||
return e;
|
||||
}
|
||||
struct command_context *cmd_ctx = current_command_context(interp);
|
||||
@@ -5658,7 +5658,7 @@ static const struct command_registration target_instance_command_handlers[] = {
|
||||
COMMAND_REGISTRATION_DONE
|
||||
};
|
||||
|
||||
static int target_create(Jim_GetOptInfo *goi)
|
||||
static int target_create(struct jim_getopt_info *goi)
|
||||
{
|
||||
Jim_Obj *new_cmd;
|
||||
Jim_Cmd *cmd;
|
||||
@@ -5677,7 +5677,7 @@ static int target_create(Jim_GetOptInfo *goi)
|
||||
}
|
||||
|
||||
/* COMMAND */
|
||||
Jim_GetOpt_Obj(goi, &new_cmd);
|
||||
jim_getopt_obj(goi, &new_cmd);
|
||||
/* does this command exist? */
|
||||
cmd = Jim_GetCommand(goi->interp, new_cmd, JIM_ERRMSG);
|
||||
if (cmd) {
|
||||
@@ -5687,7 +5687,7 @@ static int target_create(Jim_GetOptInfo *goi)
|
||||
}
|
||||
|
||||
/* TYPE */
|
||||
e = Jim_GetOpt_String(goi, &cp, NULL);
|
||||
e = jim_getopt_string(goi, &cp, NULL);
|
||||
if (e != JIM_OK)
|
||||
return e;
|
||||
struct transport *tr = get_current_transport();
|
||||
@@ -5991,8 +5991,8 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
|
||||
static int jim_target_create(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
|
||||
{
|
||||
Jim_GetOptInfo goi;
|
||||
Jim_GetOpt_Setup(&goi, interp, argc - 1, argv + 1);
|
||||
struct jim_getopt_info goi;
|
||||
jim_getopt_setup(&goi, interp, argc - 1, argv + 1);
|
||||
if (goi.argc < 3) {
|
||||
Jim_WrongNumArgs(goi.interp, goi.argc, goi.argv,
|
||||
"<name> <target_type> [<target_options> ...]");
|
||||
|
||||
Reference in New Issue
Block a user