summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-01 15:20:35 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-03-01 15:20:35 +0000
commit007e9e2d60ac6e23e7e74bfc6bcf009d7e029fb6 (patch)
tree991d9d8104d92db13226eea87549250e9d90bf3b
parent44ab4ec6cebcfb6a552c752a08123f8379d0cc05 (diff)
downloadopenocd_libswd-007e9e2d60ac6e23e7e74bfc6bcf009d7e029fb6.tar.gz
openocd_libswd-007e9e2d60ac6e23e7e74bfc6bcf009d7e029fb6.tar.bz2
openocd_libswd-007e9e2d60ac6e23e7e74bfc6bcf009d7e029fb6.tar.xz
openocd_libswd-007e9e2d60ac6e23e7e74bfc6bcf009d7e029fb6.zip
Now uses jtag_add_shift() via embeddedice_write_reg_inner().
git-svn-id: svn://svn.berlios.de/openocd/trunk@414 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/target/embeddedice.c40
1 files changed, 1 insertions, 39 deletions
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index 333c1c46..30258270 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -374,11 +374,6 @@ int embeddedice_set_reg_w_exec(reg_t *reg, u8 *buf)
int embeddedice_write_reg(reg_t *reg, u32 value)
{
embeddedice_reg_t *ice_reg = reg->arch_info;
- u8 reg_addr = ice_reg->addr & 0x1f;
- scan_field_t fields[3];
- u8 field0_out[4];
- u8 field1_out[1];
- u8 field2_out[1];
DEBUG("%i: 0x%8.8x", ice_reg->addr, value);
@@ -386,41 +381,8 @@ int embeddedice_write_reg(reg_t *reg, u32 value)
arm_jtag_scann(ice_reg->jtag_info, 0x2);
arm_jtag_set_instr(ice_reg->jtag_info, ice_reg->jtag_info->intest_instr, NULL);
-
- fields[0].device = ice_reg->jtag_info->chain_pos;
- fields[0].num_bits = 32;
- fields[0].out_value = field0_out;
- buf_set_u32(fields[0].out_value, 0, 32, value);
- fields[0].out_mask = 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].device = ice_reg->jtag_info->chain_pos;
- fields[1].num_bits = 5;
- fields[1].out_value = field1_out;
- buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
- fields[1].out_mask = NULL;
- 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].device = ice_reg->jtag_info->chain_pos;
- fields[2].num_bits = 1;
- fields[2].out_value = field2_out;
- buf_set_u32(fields[2].out_value, 0, 1, 1);
- fields[2].out_mask = NULL;
- 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, -1);
+ embeddedice_write_reg_inner(reg, value);
return ERROR_OK;
}