diff options
| author | duane <duane@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-11-30 22:25:43 +0000 |
|---|---|---|
| committer | duane <duane@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-11-30 22:25:43 +0000 |
| commit | a28eaa85f73759bb189a46308642502c9fa5aa4b (patch) | |
| tree | 93ed39ee8fe48131e227a01a788be91b88203064 /src/target/arm11_dbgtap.c | |
| parent | 91afc3dc3083a3d4f6a4104a5132d87c8ec03c7f (diff) | |
| download | openocd_libswd-a28eaa85f73759bb189a46308642502c9fa5aa4b.tar.gz openocd_libswd-a28eaa85f73759bb189a46308642502c9fa5aa4b.tar.bz2 openocd_libswd-a28eaa85f73759bb189a46308642502c9fa5aa4b.tar.xz openocd_libswd-a28eaa85f73759bb189a46308642502c9fa5aa4b.zip | |
jtag newtap change & huge manual update
git-svn-id: svn://svn.berlios.de/openocd/trunk@1194 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/arm11_dbgtap.c')
| -rw-r--r-- | src/target/arm11_dbgtap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c index 09e8b78c..a6660cdd 100644 --- a/src/target/arm11_dbgtap.c +++ b/src/target/arm11_dbgtap.c @@ -78,7 +78,7 @@ int arm11_add_dr_scan_vc(int num_fields, scan_field_t *fields, enum tap_state st */ void arm11_setup_field(arm11_common_t * arm11, int num_bits, void * out_data, void * in_data, scan_field_t * field) { - field->device = arm11->jtag_info.chain_pos; + field->tap = arm11->jtag_info.tap; field->num_bits = num_bits; field->out_mask = NULL; field->in_check_mask = NULL; @@ -101,16 +101,17 @@ void arm11_setup_field(arm11_common_t * arm11, int num_bits, void * out_data, vo */ void arm11_add_IR(arm11_common_t * arm11, u8 instr, enum tap_state state) { - jtag_device_t *device = jtag_get_device(arm11->jtag_info.chain_pos); - if (device==NULL) - { + jtag_tap_t *tap; + tap = arm11->jtag_info.tap; + if( tap == NULL ){ /* FIX!!!! error is logged, but not propagated back up the call stack... */ + LOG_ERROR( "tap is null here! This is bad!"); + return; } - if (buf_get_u32(device->cur_instr, 0, 5) == instr) - { - JTAG_DEBUG("IR <= 0x%02x SKIPPED", instr); - return; + if (buf_get_u32(tap->cur_instr, 0, 5) == instr){ + JTAG_DEBUG("IR <= 0x%02x SKIPPED", instr); + return; } JTAG_DEBUG("IR <= 0x%02x", instr); |