X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=22538ca58b887f629f9fce53ccaa530337b2b5d7;hb=c09cd75d9bcd402df0e83a361c6c77117af2e426;hp=f8b5f4f4f1fd652494a5575e839f045247d1e570;hpb=ec108ff59e23ec32abf1223488ad96dd26205a5b;p=openocd.git

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index f8b5f4f4f1..22538ca58b 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -20,18 +20,19 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "arm_jtag.h"
 
-
 #if 0
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture, tap_state_t end_state)
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
+		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
 	struct jtag_tap *tap;
 	tap = jtag_info->tap;
@@ -40,14 +41,12 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  vo
 
 	field.num_bits = tap->ir_length;
 	field.out_value = t;
-	buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
+	buf_set_u32(t, 0, field.num_bits, new_instr);
 	field.in_value = NULL;
 
 	if (no_verify_capture == NULL)
-	{
 		jtag_add_ir_scan(tap, &field, end_state);
-	} else
-	{
+	else {
 		/* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
 		 * have special verification code.
 		 */
@@ -63,13 +62,12 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, ta
 	uint32_t values[1];
 	int num_bits[1];
 
-	values[0]=new_scan_chain;
-	num_bits[0]=jtag_info->scann_size;
+	values[0] = new_scan_chain;
+	num_bits[0] = jtag_info->scann_size;
 
-	if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state)) != ERROR_OK)
-	{
+	retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state);
+	if (retval != ERROR_OK)
 		return retval;
-	}
 
 	jtag_add_dr_out(jtag_info->tap,
 			1,
@@ -82,14 +80,12 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, ta
 	return retval;
 }
 
-int arm_jtag_reset_callback(enum jtag_event event, void *priv)
+static int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
 	struct arm_jtag *jtag_info = priv;
 
 	if (event == JTAG_TRST_ASSERTED)
-	{
 		jtag_info->cur_scan_chain = 0;
-	}
 
 	return ERROR_OK;
 }