openocd: fix SPDX tag format for files .c

[fw/openocd] / src / target / arm_jtag.c

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 9b73d4ea8439a80c7b6cb41a3f2c02e59dda9a3b..c1ec4735ac6a6b73feac7f892b29f982dadc4ecd 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -1,22 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
  *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
- *                                                                         *
- *   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, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -33,14 +22,14 @@ int arm_jtag_set_instr_inner(struct jtag_tap *tap,
                uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
        struct scan_field field;
-       uint8_t t[4];
+       uint8_t t[4] = { 0 };
 
        field.num_bits = tap->ir_length;
        field.out_value = t;
        buf_set_u32(t, 0, field.num_bits, new_instr);
        field.in_value = NULL;
 
-       if (no_verify_capture == NULL)
+       if (!no_verify_capture)
                jtag_add_ir_scan(tap, &field, end_state);
        else {
                /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
@@ -56,7 +45,7 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, ta
 {
        int retval = ERROR_OK;
 
-       uint8_t out_value[4];
+       uint8_t out_value[4] = { 0 };
        buf_set_u32(out_value, 0, jtag_info->scann_size, new_scan_chain);
        struct scan_field field = { .num_bits = jtag_info->scann_size, .out_value = out_value, };
 
@@ -92,3 +81,8 @@ int arm_jtag_setup_connection(struct arm_jtag *jtag_info)
 
        return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }
+
+int arm_jtag_close_connection(struct arm_jtag *jtag_info)
+{
+       return jtag_unregister_event_callback(arm_jtag_reset_callback, jtag_info);
+}