diff options
Diffstat (limited to 'src/target/embeddedice.c')
| -rw-r--r-- | src/target/embeddedice.c | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index c59a2ede..cfe4ed7c 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -253,10 +253,10 @@ int embeddedice_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 = ice_reg->jtag_info->tap; fields[1].num_bits = 5; @@ -264,10 +264,10 @@ int embeddedice_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask) buf_set_u32(fields[1].out_value, 0, 5, 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 = ice_reg->jtag_info->tap; fields[2].num_bits = 1; @@ -275,10 +275,10 @@ int embeddedice_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); @@ -315,10 +315,10 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size) 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 = jtag_info->tap; fields[1].num_bits = 5; @@ -326,10 +326,10 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size) buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]); 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 = jtag_info->tap; fields[2].num_bits = 1; @@ -337,10 +337,10 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size) 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); @@ -432,10 +432,10 @@ int embeddedice_send(arm_jtag_t *jtag_info, u32 *data, u32 size) fields[0].out_value = field0_out; 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 = jtag_info->tap; fields[1].num_bits = 5; @@ -443,10 +443,10 @@ int embeddedice_send(arm_jtag_t *jtag_info, u32 *data, u32 size) buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]); 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 = jtag_info->tap; fields[2].num_bits = 1; @@ -454,10 +454,10 @@ int embeddedice_send(arm_jtag_t *jtag_info, u32 *data, u32 size) 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; + while (size > 0) { @@ -501,10 +501,10 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout) fields[0].out_value = NULL; fields[0].in_value = field0_in; - 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 = jtag_info->tap; fields[1].num_bits = 5; @@ -512,10 +512,10 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout) buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]); 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 = jtag_info->tap; fields[2].num_bits = 1; @@ -523,10 +523,10 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout) 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); gettimeofday(&lap, NULL); |