jtag: linuxgpiod: drop extra parenthesis

[openocd.git] / src / target / arm_dap.c

diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c
index 05fd6806a6d69c6fdb4c6e1cdc6f204ac93bd2d2..9f4afae74372b2c287fa935094224a830cfc88eb 100644 (file)
--- a/src/target/arm_dap.c
+++ b/src/target/arm_dap.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2016 by Matthias Welwarsky                              *
  *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *                                                                         *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -32,8 +20,6 @@
 
 static LIST_HEAD(all_dap);
 
-extern const struct dap_ops swd_dap_ops;
-extern const struct dap_ops jtag_dp_ops;
 extern struct adapter_driver *adapter_driver;
 
 /* DAP command support */
@@ -105,6 +91,7 @@ static int dap_init_all(void)
 {
        struct arm_dap_object *obj;
        int retval;
+       bool pre_connect = true;
 
        LOG_DEBUG("Initializing all DAPs ...");
 
@@ -137,6 +124,14 @@ static int dap_init_all(void)
                                is_adiv6(dap) ? "ADIv6" : "ADIv5");
                }
 
+               if (pre_connect && dap->ops->pre_connect_init) {
+                       retval = dap->ops->pre_connect_init(dap);
+                       if (retval != ERROR_OK)
+                               return retval;
+
+                       pre_connect = false;
+               }
+
                retval = dap->ops->connect(dap);
                if (retval != ERROR_OK)
                        return retval;
@@ -433,20 +428,16 @@ static int jim_dap_create(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
        return dap_create(&goi);
 }
 
-static int jim_dap_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(handle_dap_names)
 {
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        struct arm_dap_object *obj;
+       list_for_each_entry(obj, &all_dap, lh)
+               command_print(CMD, "%s", obj->name);
 
-       if (argc != 1) {
-               Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
-               return JIM_ERR;
-       }
-       Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
-       list_for_each_entry(obj, &all_dap, lh) {
-               Jim_ListAppendElement(interp, Jim_GetResult(interp),
-                       Jim_NewStringObj(interp, obj->name, -1));
-       }
-       return JIM_OK;
+       return ERROR_OK;
 }
 
 COMMAND_HANDLER(handle_dap_init)
@@ -512,7 +503,7 @@ static const struct command_registration dap_subcommand_handlers[] = {
        {
                .name = "names",
                .mode = COMMAND_ANY,
-               .jim_handler = jim_dap_names,
+               .handler = handle_dap_names,
                .usage = "",
                .help = "Lists all registered DAP instances by name",
        },