Introduce jtag_get_end_state() fn to clarify code a bit.

[fw/openocd] / src / target / embeddedice.h

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 9e7f47ca5a45d9b4bf3e2ed5112778432a9f30d5..4fdadfb7e52529b6c948d71a1a319809a080e080 100644 (file)
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -26,9 +26,6 @@
 #ifndef EMBEDDED_ICE_H
 #define EMBEDDED_ICE_H
 
-#include "target.h"
-#include "register.h"
-#include "arm_jtag.h"
 #include "arm7_9_common.h"
 
 enum
@@ -111,9 +108,9 @@ extern int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout);
 /* If many embeddedice_write_reg() follow eachother, then the >1 invocations can be this faster version of
  * embeddedice_write_reg
  */
-static const int embeddedice_num_bits[]={32,5,1};
 static __inline__ void embeddedice_write_reg_inner( jtag_tap_t *tap, int reg_addr, u32 value)
 {
+       static const int embeddedice_num_bits[]={32,5,1};
        u32 values[3];
 
        values[0]=value;
@@ -124,10 +121,9 @@ static __inline__ void embeddedice_write_reg_inner( jtag_tap_t *tap, int reg_add
                        3,
                        embeddedice_num_bits,
                        values,
-                       -1);
+                       jtag_get_end_state());
 }
 
 void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count);
 
-
 #endif /* EMBEDDED_ICE_H */