From e86dee32004d750e8654fe449bfcdffaed7339fa Mon Sep 17 00:00:00 2001 From: oharboe Date: Wed, 6 May 2009 07:21:46 +0000 Subject: remove unecessary setting of deprecated fields to NULL git-svn-id: svn://svn.berlios.de/openocd/trunk@1611 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/etb.c | 66 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'src/target/etb.c') diff --git a/src/target/etb.c b/src/target/etb.c index deecf141..f533bb6e 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -72,10 +72,10 @@ static int etb_set_instr(etb_t *etb, u32 new_instr) buf_set_u32(field.out_value, 0, field.num_bits, new_instr); field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; + + field.in_handler = NULL; - field.in_handler_priv = NULL; + jtag_add_ir_scan(1, &field, TAP_INVALID); @@ -97,10 +97,10 @@ static int etb_scann(etb_t *etb, u32 new_scan_chain) buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain); field.in_value = NULL; - field.in_check_value = NULL; - field.in_check_mask = NULL; + + field.in_handler = NULL; - field.in_handler_priv = NULL; + /* select INTEST instruction */ etb_set_instr(etb, 0x2); @@ -188,10 +188,10 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames) fields[0].out_value = 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].tap = etb->tap; fields[1].num_bits = 7; @@ -199,10 +199,10 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames) buf_set_u32(fields[1].out_value, 0, 7, 4); 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].tap = etb->tap; fields[2].num_bits = 1; @@ -210,10 +210,10 @@ static int etb_read_ram(etb_t *etb, u32 *data, int num_frames) buf_set_u32(fields[2].out_value, 0, 1, 0); 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, TAP_INVALID); @@ -259,10 +259,10 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) fields[0].out_value = reg->value; 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].tap = etb_reg->etb->tap; fields[1].num_bits = 7; @@ -270,10 +270,10 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) buf_set_u32(fields[1].out_value, 0, 7, reg_addr); 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].tap = etb_reg->etb->tap; fields[2].num_bits = 1; @@ -281,10 +281,10 @@ int etb_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) buf_set_u32(fields[2].out_value, 0, 1, 0); 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, TAP_INVALID); @@ -356,10 +356,10 @@ int etb_write_reg(reg_t *reg, u32 value) buf_set_u32(fields[0].out_value, 0, 32, value); 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].tap = etb_reg->etb->tap; fields[1].num_bits = 7; @@ -367,10 +367,10 @@ int etb_write_reg(reg_t *reg, u32 value) buf_set_u32(fields[1].out_value, 0, 7, reg_addr); 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].tap = etb_reg->etb->tap; fields[2].num_bits = 1; @@ -378,10 +378,10 @@ int etb_write_reg(reg_t *reg, u32 value) buf_set_u32(fields[2].out_value, 0, 1, 1); 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, TAP_INVALID); -- cgit v1.2.3