diff options
author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-08 09:48:00 +0000 |
---|---|---|
committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-08 09:48:00 +0000 |
commit | 57bc9f37c9029f1b481cd50e15676a0f74aa9e92 (patch) | |
tree | 547bae31fa4f90ea78a6042c4f3889a483fe897f /src/jtag/zy1000.c | |
parent | 4df87471ca53417fdcbe3285db4b70d710414a24 (diff) |
in_handler in_check_mask and in_check_value now removed from field. Last big patch in the series of JTAG API cleanup.
git-svn-id: svn://svn.berlios.de/openocd/trunk@1672 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/zy1000.c')
-rw-r--r-- | src/jtag/zy1000.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c index b1778068..ae082e2c 100644 --- a/src/jtag/zy1000.c +++ b/src/jtag/zy1000.c @@ -468,24 +468,6 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_ if (fields[i].in_value!=NULL) { inBuffer=fields[i].in_value; - } else if (fields[i].in_handler!=NULL) - { - if (in_buff_size*8<num_bits) - { - // we need more space - if (in_buff!=NULL) - free(in_buff); - in_buff=NULL; - in_buff_size=(num_bits+7)/8; - in_buff=malloc(in_buff_size); - if (in_buff==NULL) - { - LOG_ERROR("Out of memory"); - jtag_error=ERROR_JTAG_QUEUE_FAILED; - return; - } - } - inBuffer=in_buff; } // here we shuffle N bits out/in @@ -535,17 +517,6 @@ static __inline void scanFields(int num_fields, scan_field_t *fields, tap_state_ } j+=k; } - - if (fields[i].in_handler!=NULL) - { - // invoke callback - int r=fields[i].in_handler(inBuffer, fields[i].in_handler_priv, fields+i); - if (r!=ERROR_OK) - { - /* this will cause jtag_execute_queue() to return an error */ - jtag_error=r; - } - } } } @@ -577,15 +548,6 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t { found = 1; - if ((jtag_verify_capture_ir)&&(fields[j].in_handler==NULL)) - { - jtag_set_check_value(fields+j, tap->expected, tap->expected_mask, NULL); - } else if (jtag_verify_capture_ir) - { - fields[j].in_check_value = tap->expected; - fields[j].in_check_mask = tap->expected_mask; - } - scanFields(1, fields+j, TAP_IRSHIFT, pause); /* update device information */ buf_cpy(fields[j].out_value, tap->cur_instr, scan_size); @@ -656,10 +618,6 @@ int interface_jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t tmp.num_bits = 1; tmp.out_value = NULL; tmp.in_value = NULL; - tmp.in_check_value = NULL; - tmp.in_check_mask = NULL; - tmp.in_handler = NULL; - tmp.in_handler_priv = NULL; scanFields(1, &tmp, TAP_DRSHIFT, pause); } |