jtag: move declaration outside function

The function jtag_debug_state_machine_() is only used by a static
inline function and declared inside it as private.
The static analyser 'sparse' complains that the function is
defined as global but not cross checked against a prototype in an
include file.

Move the declaration outside the inline function so it get visible
by interface.c, which already includes interface.h
While there, change the argument type from 'unsigned' to 'unsigned
int' to pass checkpatch check.

Change-Id: Ia5dfb92dc4bc6d52ead4f0cb8c68319c83ff85b0
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7672
Tested-by: jenkins

diff --git a/src/jtag/interface.c b/src/jtag/interface.c
index bc9ff3e3504e3ed68c75bf153993a2fe08c1dde1..1230bb1b3d914dc8b77a583ee2a2442e84be0f30 100644 (file)
--- a/src/jtag/interface.c
+++ b/src/jtag/interface.c
@@ -372,7 +372,7 @@ tap_state_t tap_state_by_name(const char *name)
        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)
+       unsigned int tap_bits, tap_state_t next_state)
 {
        const uint8_t *tms_buffer;
        const uint8_t *tdi_buffer;

diff --git a/src/jtag/interface.h b/src/jtag/interface.h
index ccea9b26605e5f1beaf6c7ecb42a1dad3c4d4b46..50044935bd59671b98984dd925ca2246f12765b9 100644 (file)
--- a/src/jtag/interface.h
+++ b/src/jtag/interface.h
@@ -147,6 +147,8 @@ void tap_use_new_tms_table(bool use_new);
 /** @returns True if new TMS table is active; false otherwise. */
 bool tap_uses_new_tms_table(void);
 
+tap_state_t jtag_debug_state_machine_(const void *tms_buf, const void *tdi_buf,
+               unsigned int tap_len, tap_state_t start_tap_state);
 
 /**
  * @brief Prints verbose TAP state transitions for the given TMS/TDI buffers.
@@ -159,10 +161,6 @@ bool tap_uses_new_tms_table(void);
 static inline tap_state_t jtag_debug_state_machine(const void *tms_buf,
                const void *tdi_buf, unsigned tap_len, tap_state_t start_tap_state)
 {
-       /* Private declaration */
-       tap_state_t jtag_debug_state_machine_(const void *tms_buf, const void *tdi_buf,
-                       unsigned tap_len, tap_state_t start_tap_state);
-
        if (LOG_LEVEL_IS(LOG_LVL_DEBUG_IO))
                return jtag_debug_state_machine_(tms_buf, tdi_buf, tap_len, start_tap_state);
        else