Group JTAG reset configuration and accessor APIs together in header file.

Remove unused reset_line_mode enumerated type.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2187 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 13 insertions, 16 deletions

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 317566c..8281938 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -185,11 +185,6 @@ extern unsigned jtag_tap_count_enabled(void);
 extern unsigned jtag_tap_count(void);
 
 
-enum reset_line_mode {
-	LINE_OPEN_DRAIN = 0x0,
-	LINE_PUSH_PULL  = 0x1,
-};
-
 /* 
  * There are three cases when JTAG_TRST_ASSERTED callback is invoked. The
  * event is invoked *after* TRST is asserted(or queued rather). It is illegal 
@@ -217,11 +212,6 @@ struct jtag_tap_event_action_s
 	jtag_tap_event_action_t* next;
 };
 
-/// @returns The current state of TRST.
-int jtag_get_trst(void);
-/// @returns The current state of SRST.
-int jtag_get_srst(void);
-
 /**
  * Defines the function signature requide for JTAG event callback
  * functions, which are added with jtag_register_event_callback()
@@ -274,6 +264,19 @@ enum reset_types {
 enum reset_types jtag_get_reset_config(void);
 void jtag_set_reset_config(enum reset_types type);
 
+void jtag_set_nsrst_delay(unsigned delay);
+unsigned jtag_get_nsrst_delay(void);
+
+void jtag_set_ntrst_delay(unsigned delay);
+unsigned jtag_get_ntrst_delay(void);
+
+/// @returns The current state of TRST.
+int jtag_get_trst(void);
+/// @returns The current state of SRST.
+int jtag_get_srst(void);
+
+
+
 /**
  * Initialize interface upon startup.  Return a successful no-op upon
  * subsequent invocations.
@@ -669,12 +672,6 @@ extern void jtag_add_dr_out(jtag_tap_t* tap,
 /// @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);
-unsigned jtag_get_nsrst_delay(void);
-
-void jtag_set_ntrst_delay(unsigned delay);
-unsigned jtag_get_ntrst_delay(void);
-
 int jtag_config_khz(unsigned khz);
 void jtag_set_speed_khz(unsigned speed);
 unsigned jtag_get_speed_khz(void);