jtag: remove jtag_get_end_state()'s that should be unecessary

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

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 23673f918658dc2f083aa29af1b9f7294f17bcdf..d2781152732bec3012ec6e31b443fcd2397280e9 100644 (file)
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -93,10 +93,10 @@ struct embeddedice_reg
        struct arm_jtag *jtag_info;
 };
 
-struct reg_cache* embeddedice_build_reg_cache(target_t *target,
+struct reg_cache* embeddedice_build_reg_cache(struct target *target,
                struct arm7_9_common *arm7_9);
 
-int embeddedice_setup(target_t *target);
+int embeddedice_setup(struct target *target);
 
 int embeddedice_read_reg(struct reg *reg);
 int embeddedice_read_reg_w_check(struct reg *reg,
@@ -118,18 +118,17 @@ 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());
+                       TAP_IDLE);
 }
 
 void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count);