in_handler in_check_mask and in_check_value now removed from field. Last big patch in the series of JTAG API cleanup.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1672 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 23 insertions, 31 deletions

diff --git a/src/target/avrt.c b/src/target/avrt.c
index 86ada2b2..af692dd3 100644
--- a/src/target/avrt.c
+++ b/src/target/avrt.c
@@ -126,10 +126,10 @@ int avr_register_commands(struct command_context_s *cmd_ctx)
 int avr_target_create(struct target_s *target, Jim_Interp *interp)
 {
 	avr_common_t *avr = calloc(1, sizeof(avr_common_t));
-	
+
 	avr->jtag_info.tap = target->tap;
 	target->arch_info = avr;
-	
+
 	return ERROR_OK;
 }
 
@@ -157,7 +157,7 @@ int avr_poll(target_t *target)
 	{
 		target->state = TARGET_HALTED;
 	}
-	
+
 	LOG_DEBUG("%s", __FUNCTION__);
 	return ERROR_OK;
 }
@@ -183,7 +183,7 @@ int avr_step(struct target_s *target, int current, u32 address, int handle_break
 int avr_assert_reset(target_t *target)
 {
 	target->state = TARGET_RESET;
-	
+
 	LOG_DEBUG("%s", __FUNCTION__);
 	return ERROR_OK;
 }
@@ -191,7 +191,7 @@ int avr_assert_reset(target_t *target)
 int avr_deassert_reset(target_t *target)
 {
 	target->state = TARGET_RUNNING;
-	
+
 	LOG_DEBUG("%s", __FUNCTION__);
 	return ERROR_OK;
 }
@@ -225,21 +225,17 @@ int mcu_write_ir(jtag_tap_t *tap, u8 *ir_in, u8 *ir_out, int ir_len, int rti)
 		LOG_ERROR("invalid ir_len");
 		return ERROR_FAIL;
 	}
-	
+
 	{
 		scan_field_t field[1];
-		
+
 		field[0].tap = tap;
 		field[0].num_bits = tap->ir_length;
 		field[0].out_value = ir_out;
 		field[0].in_value = ir_in;
-		field[0].in_check_value = NULL;
-		field[0].in_check_mask = NULL;
-		field[0].in_handler = NULL;
-		field[0].in_handler_priv = NULL;
 		jtag_add_plain_ir_scan(sizeof(field) / sizeof(field[0]), field, TAP_IDLE);
 	}
-	
+
 	return ERROR_OK;
 }
 
@@ -250,21 +246,17 @@ int mcu_write_dr(jtag_tap_t *tap, u8 *dr_in, u8 *dr_out, int dr_len, int rti)
 		LOG_ERROR("invalid tap");
 		return ERROR_FAIL;
 	}
-	
+
 	{
 		scan_field_t field[1];
-		
+
 		field[0].tap = tap;
 		field[0].num_bits = dr_len;
 		field[0].out_value = dr_out;
 		field[0].in_value = dr_in;
-		field[0].in_check_value = NULL;
-		field[0].in_check_mask = NULL;
-		field[0].in_handler = NULL;
-		field[0].in_handler_priv = NULL;
 		jtag_add_plain_dr_scan(sizeof(field) / sizeof(field[0]), field, TAP_IDLE);
 	}
-	
+
 	return ERROR_OK;
 }
 
@@ -275,9 +267,9 @@ int mcu_write_ir_u8(jtag_tap_t *tap, u8 *ir_in, u8 ir_out, int ir_len, int rti)
 		LOG_ERROR("ir_len overflow, maxium is 8");
 		return ERROR_FAIL;
 	}
-	
+
 	mcu_write_ir(tap, ir_in, &ir_out, ir_len, rti);
-	
+
 	return ERROR_OK;
 }
 
@@ -288,9 +280,9 @@ int mcu_write_dr_u8(jtag_tap_t *tap, u8 *dr_in, u8 dr_out, int dr_len, int rti)
 		LOG_ERROR("dr_len overflow, maxium is 8");
 		return ERROR_FAIL;
 	}
-	
+
 	mcu_write_dr(tap, dr_in, &dr_out, dr_len, rti);
-	
+
 	return ERROR_OK;
 }
 
@@ -301,9 +293,9 @@ int mcu_write_ir_u16(jtag_tap_t *tap, u16 *ir_in, u16 ir_out, int ir_len, int rt
 		LOG_ERROR("ir_len overflow, maxium is 16");
 		return ERROR_FAIL;
 	}
-	
+
 	mcu_write_ir(tap, (u8*)ir_in, (u8*)&ir_out, ir_len, rti);
-	
+
 	return ERROR_OK;
 }
 
@@ -314,9 +306,9 @@ int mcu_write_dr_u16(jtag_tap_t *tap, u16 *dr_in, u16 dr_out, int dr_len, int rt
 		LOG_ERROR("dr_len overflow, maxium is 16");
 		return ERROR_FAIL;
 	}
-	
+
 	mcu_write_dr(tap, (u8*)dr_in, (u8*)&dr_out, dr_len, rti);
-	
+
 	return ERROR_OK;
 }
 
@@ -327,9 +319,9 @@ int mcu_write_ir_u32(jtag_tap_t *tap, u32 *ir_in, u32 ir_out, int ir_len, int rt
 		LOG_ERROR("ir_len overflow, maxium is 32");
 		return ERROR_FAIL;
 	}
-	
+
 	mcu_write_ir(tap, (u8*)ir_in, (u8*)&ir_out, ir_len, rti);
-	
+
 	return ERROR_OK;
 }
 
@@ -340,9 +332,9 @@ int mcu_write_dr_u32(jtag_tap_t *tap, u32 *dr_in, u32 dr_out, int dr_len, int rt
 		LOG_ERROR("dr_len overflow, maxium is 32");
 		return ERROR_FAIL;
 	}
-	
+
 	mcu_write_dr(tap, (u8*)dr_in, (u8*)&dr_out, dr_len, rti);
-	
+
 	return ERROR_OK;
 }