Cleanup and encapsulate IR Capture verification:

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

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 85b2a32e98241746d0ec320a84a42cf144f5377d..165e19662b278136df7733fbab005a8d5320d4f8 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -58,7 +58,7 @@ static void jtag_add_scan_check(void (*jtag_add_scan)(int in_num_fields, const s
  */
 static int jtag_error = ERROR_OK;
 
-char* jtag_event_strings[] =
+static char* jtag_event_strings[] =
 {
        "JTAG controller reset (RESET or TRST)"
 };
@@ -83,12 +83,12 @@ static jtag_tap_t *__jtag_all_taps = NULL;
  */
 static unsigned jtag_num_taps = 0;
 
-enum reset_types jtag_reset_config = RESET_NONE;
-tap_state_t cmd_queue_end_state = TAP_RESET;
+static enum reset_types jtag_reset_config = RESET_NONE;
+static tap_state_t cmd_queue_end_state = TAP_RESET;
 tap_state_t cmd_queue_cur_state = TAP_RESET;
 
-int jtag_verify_capture_ir = 1;
-int jtag_verify = 1;
+static bool jtag_verify_capture_ir = true;
+static int jtag_verify = 1;
 
 /* how long the OpenOCD should wait before attempting JTAG communication after reset lines deasserted (in ms) */
 static int jtag_nsrst_delay = 0; /* default to no nSRST delay */
@@ -106,7 +106,7 @@ struct jtag_interface_s *jtag = NULL;
 
 /* configuration */
 jtag_interface_t *jtag_interface = NULL;
-int jtag_speed = 0;
+static int jtag_speed = 0;
 
 void jtag_set_error(int error)
 {
@@ -1201,6 +1201,15 @@ bool jtag_will_verify()
        return jtag_verify;
 }
 
+void jtag_set_verify_capture_ir(bool enable)
+{
+       jtag_verify_capture_ir = enable;
+}
+
+bool jtag_will_verify_capture_ir()
+{
+       return jtag_verify_capture_ir;
+}
 
 int jtag_power_dropout(int *dropout)
 {