jtag: linuxgpiod: drop extra parenthesis

[openocd.git] / src / jtag / core.c

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 29ab6cc1cc7d3f38ac54f08615d50902a097ebd6..c84d5aa3d3d32e0a263bc12f31565563bb97fe3c 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2009 Zachary T Welch                                    *
  *   zw@superlucidity.net                                                  *
@@ -11,19 +13,6 @@
  *                                                                         *
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   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
@@ -147,14 +136,19 @@ int jtag_error_clear(void)
 
 /************/
 
-static bool jtag_poll = 1;
+static bool jtag_poll = true;
+static bool jtag_poll_en = true;
 
 bool is_jtag_poll_safe(void)
 {
        /* Polling can be disabled explicitly with set_enabled(false).
+        * It can also be masked with mask().
         * It is also implicitly disabled while TRST is active and
         * while SRST is gating the JTAG clock.
         */
+       if (!jtag_poll_en)
+               return false;
+
        if (!transport_is_jtag())
                return jtag_poll;
 
@@ -173,6 +167,18 @@ void jtag_poll_set_enabled(bool value)
        jtag_poll = value;
 }
 
+bool jtag_poll_mask(void)
+{
+       bool retval = jtag_poll_en;
+       jtag_poll_en = false;
+       return retval;
+}
+
+void jtag_poll_unmask(bool saved)
+{
+       jtag_poll_en = saved;
+}
+
 /************/
 
 struct jtag_tap *jtag_all_taps(void)
@@ -945,9 +951,9 @@ int default_interface_jtag_execute_queue(void)
                        return ERROR_OK;
        }
 
-       int result = adapter_driver->jtag_ops->execute_queue();
+       struct jtag_command *cmd = jtag_command_queue_get();
+       int result = adapter_driver->jtag_ops->execute_queue(cmd);
 
-       struct jtag_command *cmd = jtag_command_queue;
        while (debug_level >= LOG_LVL_DEBUG_IO && cmd) {
                switch (cmd->type) {
                        case JTAG_SCAN:
@@ -1043,7 +1049,7 @@ static int jtag_reset_callback(enum jtag_event event, void *priv)
 
                /* current instruction is either BYPASS or IDCODE */
                buf_set_ones(tap->cur_instr, tap->ir_length);
-               tap->bypass = 1;
+               tap->bypass = true;
        }
 
        return ERROR_OK;
@@ -1171,7 +1177,7 @@ static bool jtag_examine_chain_end(uint8_t *idcodes, unsigned count, unsigned ma
 static bool jtag_examine_chain_match_tap(const struct jtag_tap *tap)
 {
 
-       if (tap->expected_ids_cnt == 0 || !tap->hasidcode)
+       if (tap->expected_ids_cnt == 0 || !tap->has_idcode)
                return true;
 
        /* optionally ignore the JTAG version field - bits 28-31 of IDCODE */
@@ -1273,17 +1279,17 @@ static int jtag_examine_chain(void)
                        jtag_tap_init(tap);
                }
 
-               if ((idcode & 1) == 0) {
+               if ((idcode & 1) == 0 && !tap->ignore_bypass) {
                        /* Zero for LSB indicates a device in bypass */
                        LOG_INFO("TAP %s does not have valid IDCODE (idcode=0x%" PRIx32 ")",
                                        tap->dotted_name, idcode);
-                       tap->hasidcode = false;
+                       tap->has_idcode = false;
                        tap->idcode = 0;
 
                        bit_count += 1;
                } else {
                        /* Friendly devices support IDCODE */
-                       tap->hasidcode = true;
+                       tap->has_idcode = true;
                        tap->idcode = idcode;
                        jtag_examine_chain_display(LOG_LVL_INFO, "tap/device found", tap->dotted_name, idcode);
 
@@ -1458,7 +1464,7 @@ void jtag_tap_init(struct jtag_tap *tap)
        buf_set_u32(tap->expected_mask, 0, ir_len_bits, tap->ir_capture_mask);
 
        /* TAP will be in bypass mode after jtag_validate_ircapture() */
-       tap->bypass = 1;
+       tap->bypass = true;
        buf_set_ones(tap->cur_instr, tap->ir_length);
 
        /* register the reset callback for the TAP */