X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fembeddedice.h;h=0c8329ee2ae87d9b6636ee7c77709151e92aa4c3;hb=f976af56a4352d0406b930528beec105df13cacb;hp=9e7f47ca5a45d9b4bf3e2ed5112778432a9f30d5;hpb=a28eaa85f73759bb189a46308642502c9fa5aa4b;p=openocd.git

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 9e7f47ca5a..0c8329ee2a 100644
--- 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);
+			TAP_INVALID);
 }
 
 void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count);
 
-
 #endif /* EMBEDDED_ICE_H */