X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fembeddedice.h;h=b1ba98955ef72462cabd80c49a9f586ecd33f119;hb=5eb638c71e95048b090b8a19640d7d4902c07902;hp=0c8329ee2ae87d9b6636ee7c77709151e92aa4c3;hpb=56504fdd7353732525e34f1e3fbd44346588f979;p=openocd.git

diff --git a/src/target/embeddedice.h b/src/target/embeddedice.h
index 0c8329ee2a..b1ba98955e 100644
--- a/src/target/embeddedice.h
+++ b/src/target/embeddedice.h
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005, 2006 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -93,37 +93,45 @@ typedef struct embeddedice_reg_s
 	arm_jtag_t *jtag_info;
 } embeddedice_reg_t;
 
-extern reg_cache_t* embeddedice_build_reg_cache(target_t *target, arm7_9_common_t *arm7_9);
-extern int embeddedice_setup(target_t *target);
-extern int embeddedice_read_reg(reg_t *reg);
-extern void embeddedice_write_reg(reg_t *reg, u32 value);
-extern int embeddedice_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask);
-extern void embeddedice_store_reg(reg_t *reg);
-extern void embeddedice_set_reg(reg_t *reg, u32 value);
-extern int embeddedice_set_reg_w_exec(reg_t *reg, u8 *buf);
-extern int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size);
-extern int embeddedice_send(arm_jtag_t *jtag_info, u32 *data, u32 size);
-extern int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout);
+reg_cache_t* embeddedice_build_reg_cache(target_t *target,
+		arm7_9_common_t *arm7_9);
+
+int embeddedice_setup(target_t *target);
+
+int embeddedice_read_reg(reg_t *reg);
+int embeddedice_read_reg_w_check(reg_t *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_set_reg(reg_t *reg, uint32_t value);
+int embeddedice_set_reg_w_exec(reg_t *reg, uint8_t *buf);
+
+int embeddedice_receive(arm_jtag_t *jtag_info, uint32_t *data, uint32_t size);
+int embeddedice_send(arm_jtag_t *jtag_info, uint32_t *data, uint32_t size);
+
+int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, uint32_t 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( jtag_tap_t *tap, int reg_addr, u32 value)
+static __inline__ void embeddedice_write_reg_inner(jtag_tap_t *tap, int reg_addr, uint32_t value)
 {
 	static const int embeddedice_num_bits[]={32,5,1};
-	u32 values[3];
+	uint32_t values[3];
 
 	values[0]=value;
 	values[1]=reg_addr;
 	values[2]=1;
 
-	jtag_add_dr_out( tap,
+	jtag_add_dr_out(tap,
 			3,
 			embeddedice_num_bits,
 			values,
-			TAP_INVALID);
+			jtag_get_end_state());
 }
 
-void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, u8 *buffer, int little, int count);
+void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int little, int count);
 
 #endif /* EMBEDDED_ICE_H */