Eliminate MixedCaps symbol from public JTAG TAP API:

[fw/openocd] / src / jtag / jtag.h

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 5fbe7dc103515dc2a2bf4b1724ef893fa55f3fd2..af1863cae364d3e46099c5c3349f866f7f7ff7df 100644 (file)
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -104,8 +104,6 @@ const char* tap_state_name(tap_state_t state);
 
 /// The current TAP state of the pending JTAG command queue.
 extern tap_state_t cmd_queue_cur_state;
-/// The TAP state in which DR scans should end.
-extern tap_state_t cmd_queue_end_state;
 
 /**
  * This structure defines a single scan field in the scan. It provides
@@ -177,11 +175,12 @@ struct jtag_tap_s
 
        jtag_tap_t* next_tap;
 };
-extern jtag_tap_t* jtag_AllTaps(void);
-extern jtag_tap_t* jtag_TapByPosition(int n);
-extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
-extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
-extern jtag_tap_t* jtag_TapByAbsPosition(int abs_position);
+extern jtag_tap_t* jtag_all_taps(void);
+extern const char *jtag_tap_name(const jtag_tap_t *tap);
+extern jtag_tap_t* jtag_tap_by_position(int n);
+extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
+extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
+extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);
 extern int jtag_NumTotalTaps(void);
 
@@ -190,7 +189,7 @@ static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)
        if (p == NULL)
        {
                /* start at the head of list */
-               p = jtag_AllTaps();
+               p = jtag_all_taps();
        }
        else
        {
@@ -488,7 +487,23 @@ extern void jtag_add_runtest(int num_cycles, tap_state_t endstate);
  */
 extern void jtag_add_reset(int req_tlr_or_trst, int srst);
 
-extern void jtag_add_end_state(tap_state_t endstate);
+
+/**
+ * Function jtag_set_end_state
+ *
+ * Set a global variable to \a state if \a state != TAP_INVALID.
+ *
+ * Return the value of the global variable.
+ *
+ **/
+extern tap_state_t jtag_set_end_state(tap_state_t state);
+/**
+ * Function jtag_get_end_state
+ *
+ * Return the value of the global variable for end state
+ *
+ **/
+extern tap_state_t jtag_get_end_state(void);
 extern void jtag_add_sleep(u32 us);
 
 
@@ -625,4 +640,15 @@ extern void jtag_add_dr_out(jtag_tap_t* tap,
  */
 extern int jtag_add_statemove(tap_state_t goal_state);
 
+
+
+/// @returns the number of times the scan queue has been flushed
+int jtag_get_flush_queue_count(void);
+void jtag_set_nsrst_delay(unsigned delay);
+void jtag_set_ntrst_delay(unsigned delay);
+void jtag_set_speed_khz(unsigned speed);
+unsigned jtag_get_speed_khz(void);
+void jtag_set_verify(bool enable);
+bool jtag_will_verify(void);
+
 #endif /* JTAG_H */