diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-07 13:31:34 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-07 13:31:34 +0000 |
| commit | f5f33771be488cba777d150ca4325fe13ebe7146 (patch) | |
| tree | 16335051dc977bcec690ecfc94263524c95013fd /src/target/arm920t.c | |
| parent | 7bb5f2124b0bf956643f3a2918039e9e1c15175e (diff) | |
| download | openocd_libswd-f5f33771be488cba777d150ca4325fe13ebe7146.tar.gz openocd_libswd-f5f33771be488cba777d150ca4325fe13ebe7146.tar.bz2 openocd_libswd-f5f33771be488cba777d150ca4325fe13ebe7146.tar.xz openocd_libswd-f5f33771be488cba777d150ca4325fe13ebe7146.zip | |
remove in_handler usage
git-svn-id: svn://svn.berlios.de/openocd/trunk@1641 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/arm920t.c')
| -rw-r--r-- | src/target/arm920t.c | 90 |
1 files changed, 38 insertions, 52 deletions
diff --git a/src/target/arm920t.c b/src/target/arm920t.c index 455ee8c5..d2ae9792 100644 --- a/src/target/arm920t.c +++ b/src/target/arm920t.c @@ -113,51 +113,37 @@ int arm920t_read_cp15_physical(target_t *target, int reg_addr, u32 *value) fields[0].tap = jtag_info->tap; fields[0].num_bits = 1; fields[0].out_value = &access_type_buf; - fields[0].in_value = NULL; - - fields[0].in_handler = NULL; - fields[1].tap = jtag_info->tap; fields[1].num_bits = 32; fields[1].out_value = NULL; - fields[1].in_value = NULL; - - fields[1].in_handler = NULL; - fields[2].tap = jtag_info->tap; fields[2].num_bits = 6; fields[2].out_value = ®_addr_buf; - fields[2].in_value = NULL; - - fields[2].in_handler = NULL; - fields[3].tap = jtag_info->tap; fields[3].num_bits = 1; fields[3].out_value = &nr_w_buf; - fields[3].in_value = NULL; - - fields[3].in_handler = NULL; - jtag_add_dr_scan(4, fields, TAP_INVALID); - fields[1].in_handler_priv = value; - fields[1].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */ + u8 tmp[4]; + fields[1].in_value = tmp; - jtag_add_dr_scan(4, fields, TAP_INVALID); + jtag_add_dr_scan_now(4, fields, TAP_INVALID); -#ifdef _DEBUG_INSTRUCTION_EXECUTION_ + *value=le_to_h_u32(tmp); + + #ifdef _DEBUG_INSTRUCTION_EXECUTION_ jtag_execute_queue(); LOG_DEBUG("addr: 0x%x value: %8.8x", reg_addr, *value); #endif @@ -185,42 +171,42 @@ int arm920t_write_cp15_physical(target_t *target, int reg_addr, u32 value) fields[0].tap = jtag_info->tap; fields[0].num_bits = 1; fields[0].out_value = &access_type_buf; - + fields[0].in_value = NULL; - - + + fields[0].in_handler = NULL; - + fields[1].tap = jtag_info->tap; fields[1].num_bits = 32; fields[1].out_value = value_buf; - + fields[1].in_value = NULL; - - + + fields[1].in_handler = NULL; - + fields[2].tap = jtag_info->tap; fields[2].num_bits = 6; fields[2].out_value = ®_addr_buf; - + fields[2].in_value = NULL; - - + + fields[2].in_handler = NULL; - + fields[3].tap = jtag_info->tap; fields[3].num_bits = 1; fields[3].out_value = &nr_w_buf; - + fields[3].in_value = NULL; - - + + fields[3].in_handler = NULL; - + jtag_add_dr_scan(4, fields, TAP_INVALID); @@ -252,42 +238,42 @@ int arm920t_execute_cp15(target_t *target, u32 cp15_opcode, u32 arm_opcode) fields[0].tap = jtag_info->tap; fields[0].num_bits = 1; fields[0].out_value = &access_type_buf; - + fields[0].in_value = NULL; - - + + fields[0].in_handler = NULL; - + fields[1].tap = jtag_info->tap; fields[1].num_bits = 32; fields[1].out_value = cp15_opcode_buf; - + fields[1].in_value = NULL; - - + + fields[1].in_handler = NULL; - + fields[2].tap = jtag_info->tap; fields[2].num_bits = 6; fields[2].out_value = ®_addr_buf; - + fields[2].in_value = NULL; - - + + fields[2].in_handler = NULL; - + fields[3].tap = jtag_info->tap; fields[3].num_bits = 1; fields[3].out_value = &nr_w_buf; - + fields[3].in_value = NULL; - - + + fields[3].in_handler = NULL; - + jtag_add_dr_scan(4, fields, TAP_INVALID); |