X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Finterface.c;h=56bbf6e51bc9624e31c8a29ccd0bec7f3c66e4b8;hp=8206b48e1f9a51b7357e9f32346a418222f4616b;hb=HEAD;hpb=38f8e5eefac748a30a4bf5e9d7a7313c8ae0e4e9

diff --git a/src/jtag/interface.c b/src/jtag/interface.c
index 8206b48e1f..1230bb1b3d 100644
--- a/src/jtag/interface.c
+++ b/src/jtag/interface.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -11,21 +13,6 @@
  *                                                                         *
  *   Copyright (C) 2009 Zachary T Welch                                    *
  *   zw@superlucidity.net                                                  *
- *                                                                         *
- *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -47,7 +34,7 @@ void tap_set_state_impl(tap_state_t new_state)
 	state_follower = new_state;
 }
 
-tap_state_t tap_get_state()
+tap_state_t tap_get_state(void)
 {
 	return state_follower;
 }
@@ -66,7 +53,7 @@ void tap_set_end_state(tap_state_t new_end_state)
 	end_state_follower = new_end_state;
 }
 
-tap_state_t tap_get_end_state()
+tap_state_t tap_get_end_state(void)
 {
 	return end_state_follower;
 }
@@ -378,16 +365,14 @@ tap_state_t tap_state_by_name(const char *name)
 	return TAP_INVALID;
 }
 
-#ifdef _DEBUG_JTAG_IO_
-
 #define JTAG_DEBUG_STATE_APPEND(buf, len, bit) \
 	do { buf[len] = bit ? '1' : '0'; } while (0)
 #define JTAG_DEBUG_STATE_PRINT(a, b, astr, bstr) \
-	DEBUG_JTAG_IO("TAP/SM: %9s -> %5s\tTMS: %s\tTDI: %s", \
+	LOG_DEBUG_IO("TAP/SM: %9s -> %5s\tTMS: %s\tTDI: %s", \
 	tap_state_name(a), tap_state_name(b), astr, bstr)
 
-tap_state_t jtag_debug_state_machine(const void *tms_buf, const void *tdi_buf,
-	unsigned tap_bits, tap_state_t next_state)
+tap_state_t jtag_debug_state_machine_(const void *tms_buf, const void *tdi_buf,
+	unsigned int tap_bits, tap_state_t next_state)
 {
 	const uint8_t *tms_buffer;
 	const uint8_t *tdi_buffer;
@@ -403,13 +388,13 @@ tap_state_t jtag_debug_state_machine(const void *tms_buf, const void *tdi_buf,
 
 	/* set startstate (and possibly last, if tap_bits == 0) */
 	last_state = next_state;
-	DEBUG_JTAG_IO("TAP/SM: START state: %s", tap_state_name(next_state));
+	LOG_DEBUG_IO("TAP/SM: START state: %s", tap_state_name(next_state));
 
 	tms_buffer = (const uint8_t *)tms_buf;
 	tdi_buffer = (const uint8_t *)tdi_buf;
 
 	tap_bytes = DIV_ROUND_UP(tap_bits, 8);
-	DEBUG_JTAG_IO("TAP/SM: TMS bits: %u (bytes: %u)", tap_bits, tap_bytes);
+	LOG_DEBUG_IO("TAP/SM: TMS bits: %u (bytes: %u)", tap_bits, tap_bytes);
 
 	tap_out_bits = 0;
 	for (cur_byte = 0; cur_byte < tap_bytes; cur_byte++) {
@@ -454,11 +439,10 @@ tap_state_t jtag_debug_state_machine(const void *tms_buf, const void *tdi_buf,
 		JTAG_DEBUG_STATE_PRINT(last_state, next_state, tms_str, tdi_str);
 	}
 
-	DEBUG_JTAG_IO("TAP/SM: FINAL state: %s", tap_state_name(next_state));
+	LOG_DEBUG_IO("TAP/SM: FINAL state: %s", tap_state_name(next_state));
 
 	return next_state;
 }
-#endif	/* _DEBUG_JTAG_IO_ */
 
 void tap_use_new_tms_table(bool use_new)
 {