X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fembeddedice.h;h=20cf2b4e7238d0915dd693d339ca59fc26328aad;hb=e66f9aaba94e232f87c725f2fce98cfb3f92679f;hp=62c5b78b728568e89f0470760e608d5b84b1b1b9;hpb=76ebc78358ef94dcf5d64c8738e6dd4bb1371b2c;p=openocd.git

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 62c5b78b72..20cf2b4e72 100644
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -104,13 +104,66 @@ 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 __inline void embeddedice_write_reg_inner(reg_t *reg, u32 value)
+static __inline__ void embeddedice_write_reg_inner(int chain_pos, int reg_addr, u32 value)
 {
-	embeddedice_reg_t *ice_reg = reg->arch_info;
-	u8 reg_addr = ice_reg->addr & 0x1f;
-	jtag_add_shift(TAP_SD, TAP_PD, 32, value);
-	jtag_add_shift(TAP_SD, TAP_PD, 5, reg_addr);
-	jtag_add_shift(TAP_SD, TAP_RTI, 1, 1);
+#if 1
+	u32 values[3];
+	int num_bits[3];
+	
+	values[0]=value;
+	num_bits[0]=32;
+	values[1]=reg_addr;
+	num_bits[1]=5;
+	values[2]=1;
+	num_bits[2]=1;
+	
+	jtag_add_dr_out(chain_pos, 
+			3,
+			num_bits,
+			values,
+			-1);
+#else
+	scan_field_t fields[3];
+	u8 field0_out[4];
+	u8 field1_out[1];
+	u8 field2_out[1];
+
+	fields[0].device = ice_reg->jtag_info->chain_pos;
+	fields[0].num_bits = 32;
+	fields[0].out_value = field0_out;
+	buf_set_u32(fields[0].out_value, 0, 32, value);
+	fields[0].out_mask = NULL;
+	fields[0].in_value = NULL;
+	fields[0].in_check_value = NULL;
+	fields[0].in_check_mask = NULL;
+	fields[0].in_handler = NULL;
+	fields[0].in_handler_priv = NULL;
+	
+	fields[1].device = ice_reg->jtag_info->chain_pos;
+	fields[1].num_bits = 5;
+	fields[1].out_value = field1_out;
+	buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
+	fields[1].out_mask = NULL;
+	fields[1].in_value = NULL;
+	fields[1].in_check_value = NULL;
+	fields[1].in_check_mask = NULL;
+	fields[1].in_handler = NULL;
+	fields[1].in_handler_priv = NULL;
+
+	fields[2].device = ice_reg->jtag_info->chain_pos;
+	fields[2].num_bits = 1;
+	fields[2].out_value = field2_out;
+	buf_set_u32(fields[2].out_value, 0, 1, 1);
+	fields[2].out_mask = NULL;
+	fields[2].in_value = NULL;
+	fields[2].in_check_value = NULL;
+	fields[2].in_check_mask = NULL;
+	fields[2].in_handler = NULL;
+	fields[2].in_handler_priv = NULL;
+	
+	jtag_add_dr_scan(3, fields, -1);
+	
+#endif
 }