jtag: linuxgpiod: drop extra parenthesis

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 43c8523056406da01bbbdbffdd966fa4ccdadf28..54c5eb34f7880b273bfb1d2ff67c1ace45e4e992 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
@@ -51,24 +51,23 @@ static const char openocd_startup_tcl[] = {
 };
 
 /* Give scripts and TELNET a way to find out what version this is */
-static int jim_version_command(Jim_Interp *interp, int argc,
-       Jim_Obj * const *argv)
+COMMAND_HANDLER(handler_version_command)
 {
-       if (argc > 2)
-               return JIM_ERR;
-       const char *str = "";
-       char *version_str;
-       version_str = OPENOCD_VERSION;
+       char *version_str = OPENOCD_VERSION;
 
-       if (argc == 2)
-               str = Jim_GetString(argv[1], NULL);
+       if (CMD_ARGC > 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       if (CMD_ARGC == 1) {
+               if (strcmp("git", CMD_ARGV[0]))
+                       return ERROR_COMMAND_ARGUMENT_INVALID;
 
-       if (strcmp("git", str) == 0)
                version_str = GITVERSION;
+       }
 
-       Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
+       command_print(CMD, "%s", version_str);
 
-       return JIM_OK;
+       return ERROR_OK;
 }
 
 static int log_target_callback_event_handler(struct target *target,
@@ -119,6 +118,8 @@ COMMAND_HANDLER(handle_init_command)
 
        initialized = 1;
 
+       bool save_poll_mask = jtag_poll_mask();
+
        retval = command_run_line(CMD_CTX, "target init");
        if (retval != ERROR_OK)
                return ERROR_FAIL;
@@ -166,6 +167,8 @@ COMMAND_HANDLER(handle_init_command)
        if (command_run_line(CMD_CTX, "tpiu init") != ERROR_OK)
                return ERROR_FAIL;
 
+       jtag_poll_unmask(save_poll_mask);
+
        /* initialize telnet subsystem */
        gdb_target_add_all(all_targets);
 
@@ -190,9 +193,10 @@ COMMAND_HANDLER(handle_add_script_search_dir_command)
 static const struct command_registration openocd_command_handlers[] = {
        {
                .name = "version",
-               .jim_handler = jim_version_command,
+               .handler = handler_version_command,
                .mode = COMMAND_ANY,
                .help = "show program version",
+               .usage = "[git]",
        },
        {
                .name = "noinit",
@@ -226,65 +230,6 @@ static int openocd_register_commands(struct command_context *cmd_ctx)
        return register_commands(cmd_ctx, NULL, openocd_command_handlers);
 }
 
-/*
- * TODO: to be removed after v0.12.0
- * workaround for syntax change of "expr" in jimtcl 0.81
- * replace "expr" with openocd version that prints the deprecated msg
- */
-struct jim_scriptobj {
-       void *token;
-       Jim_Obj *filename_obj;
-       int len;
-       int subst_flags;
-       int in_use;
-       int firstline;
-       int linenr;
-       int missing;
-};
-
-static int jim_expr_command(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
-{
-       if (argc == 2)
-               return Jim_EvalExpression(interp, argv[1]);
-
-       if (argc > 2) {
-               Jim_Obj *obj = Jim_ConcatObj(interp, argc - 1, argv + 1);
-               Jim_IncrRefCount(obj);
-               const char *s = Jim_String(obj);
-               struct jim_scriptobj *script = Jim_GetIntRepPtr(interp->currentScriptObj);
-               if (interp->currentScriptObj == interp->emptyObj ||
-                               strcmp(interp->currentScriptObj->typePtr->name, "script") ||
-                               script->subst_flags ||
-                               script->filename_obj == interp->emptyObj)
-                       LOG_WARNING("DEPRECATED! use 'expr { %s }' not 'expr %s'", s, s);
-               else
-                       LOG_WARNING("DEPRECATED! (%s:%d) use 'expr { %s }' not 'expr %s'",
-                                               Jim_String(script->filename_obj), script->linenr, s, s);
-               int retcode = Jim_EvalExpression(interp, obj);
-               Jim_DecrRefCount(interp, obj);
-               return retcode;
-       }
-
-       Jim_WrongNumArgs(interp, 1, argv, "expression ?...?");
-       return JIM_ERR;
-}
-
-static const struct command_registration expr_handler[] = {
-       {
-               .name = "expr",
-               .jim_handler = jim_expr_command,
-               .mode = COMMAND_ANY,
-               .help = "",
-               .usage = "",
-       },
-       COMMAND_REGISTRATION_DONE
-};
-
-static int workaround_for_jimtcl_expr(struct command_context *cmd_ctx)
-{
-       return register_commands(cmd_ctx, NULL, expr_handler);
-}
-
 struct command_context *global_cmd_ctx;
 
 static struct command_context *setup_command_handler(Jim_Interp *interp)
@@ -297,7 +242,6 @@ static struct command_context *setup_command_handler(Jim_Interp *interp)
        /* register subsystem commands */
        typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value);
        static const command_registrant_t command_registrants[] = {
-               &workaround_for_jimtcl_expr,
                &openocd_register_commands,
                &server_register_commands,
                &gdb_register_commands,