X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fembeddedice.h;h=cd48ce69713f457475d9e7f070afd4c07bf940f3;hp=47ef3d96b9d6160f5a02e07a990b234ed98a81c2;hb=4960c9018f2560b11ede91cde8a68dc56c690159;hpb=74d09617b927ed7011098d5a65087dee1ef1e87a

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 47ef3d96b9..cd48ce6971 100644
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -93,20 +93,20 @@ 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(reg_t *reg);
-int embeddedice_read_reg_w_check(reg_t *reg,
+int embeddedice_read_reg(struct reg *reg);
+int embeddedice_read_reg_w_check(struct reg *reg,
 		uint8_t* check_value, uint8_t* check_mask);
 
-void embeddedice_write_reg(reg_t *reg, uint32_t value);
-void embeddedice_store_reg(reg_t *reg);
+void embeddedice_write_reg(struct reg *reg, uint32_t value);
+void embeddedice_store_reg(struct reg *reg);
 
-void embeddedice_set_reg(reg_t *reg, uint32_t value);
-int embeddedice_set_reg_w_exec(reg_t *reg, uint8_t *buf);
+void embeddedice_set_reg(struct reg *reg, uint32_t value);
+int embeddedice_set_reg_w_exec(struct reg *reg, uint8_t *buf);
 
 int embeddedice_receive(struct arm_jtag *jtag_info, uint32_t *data, uint32_t size);
 int embeddedice_send(struct arm_jtag *jtag_info, uint32_t *data, uint32_t size);
@@ -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());