ARM7/9 minor cleanups

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

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 1faa1eeba620f87356d76251b7add24988eca708..cd48ce69713f457475d9e7f070afd4c07bf940f3 100644 (file)
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -26,7 +26,7 @@
 #ifndef EMBEDDED_ICE_H
 #define EMBEDDED_ICE_H
 
-#include <target/arm7_9_common.h>
+#include "arm7_9_common.h"
 
 enum
 {
@@ -118,15 +118,14 @@ int embeddedice_handshake(struct arm_jtag *jtag_info, int hsbit, uint32_t timeou
  */
 static __inline__ void embeddedice_write_reg_inner(struct jtag_tap *tap, int reg_addr, uint32_t value)
 {
-       static const int embeddedice_num_bits[]={32,5,1};
-       uint32_t values[3];
+       static const int embeddedice_num_bits[] = {32, 6};
+       uint32_t values[2];
 
-       values[0]=value;
-       values[1]=reg_addr;
-       values[2]=1;
+       values[0] = value;
+       values[1] = (1 << 5) | reg_addr;
 
        jtag_add_dr_out(tap,
-                       3,
+                       2,
                        embeddedice_num_bits,
                        values,
                        jtag_get_end_state());