summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-11 10:10:11 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-05-11 10:10:11 +0000
commite170938ae802b4e61cd87544bf81faf144d84f07 (patch)
treef30551f6ebb92ac9062c914c6bb05b4d961f2324
parent6dd335ed248124990b9a85dbc2e79f3239cd7ad0 (diff)
downloadopenocd_libswd-e170938ae802b4e61cd87544bf81faf144d84f07.tar.gz
openocd_libswd-e170938ae802b4e61cd87544bf81faf144d84f07.tar.bz2
openocd_libswd-e170938ae802b4e61cd87544bf81faf144d84f07.tar.xz
openocd_libswd-e170938ae802b4e61cd87544bf81faf144d84f07.zip
fix USB performance regression for verify_ircapture
git-svn-id: svn://svn.berlios.de/openocd/trunk@1743 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/jtag/jtag.c69
1 files changed, 23 insertions, 46 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index e2e324a4..0be66c28 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -37,6 +37,8 @@
int jtag_flush_queue_count; /* count # of flushes for profiling / debugging purposes */
+static void jtag_add_scan_check(void (*jtag_add_scan)(int num_fields, scan_field_t *fields, tap_state_t state),
+ int num_fields, scan_field_t *fields, tap_state_t state);
/* note that this is not marked as static as it must be available from outside jtag.c for those
that implement the jtag_xxx() minidriver layer
@@ -549,54 +551,22 @@ void jtag_add_ir_scan_noverify(int num_fields, scan_field_t *fields, tap_state_t
void jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
{
/* 8 x 32 bit id's is enough for all invoations */
- u32 id[8];
- int modified[8];
-
- /* if we are to run a verification of the ir scan, we need to get the input back.
- * We may have to allocate space if the caller didn't ask for the input back.
- *
- */
- if (jtag_verify_capture_ir)
- {
- int j;
- for (j = 0; j < num_fields; j++)
- {
- modified[j]=0;
- if ((fields[j].in_value==NULL)&&(fields[j].num_bits<=32))
- {
- if (j<8)
- {
- modified[j]=1;
- fields[j].in_value=(u8 *)(id+j);
- } else
- {
- LOG_DEBUG("caller must provide in_value space for verify_capture_ir to work");
- }
- }
- }
- }
-
- jtag_add_ir_scan_noverify(num_fields, fields, state);
-
- if (jtag_verify_capture_ir)
+ int j;
+ for (j = 0; j < num_fields; j++)
{
- int j;
- for (j = 0; j < num_fields; j++)
+ fields[j].check_value=NULL;
+ fields[j].check_mask=NULL;
+ /* if we are to run a verification of the ir scan, we need to get the input back.
+ * We may have to allocate space if the caller didn't ask for the input back.
+ */
+ if (jtag_verify_capture_ir)
{
- jtag_tap_t *tap=fields[j].tap;
- if (fields[j].in_value!=NULL)
- {
- /* we verify max 32 bit long irlens. */
- jtag_check_value_mask(fields+j, tap->expected, tap->expected_mask);
- }
-
- if (modified[j])
- {
- fields[j].in_value=NULL;
- }
+ fields[j].check_value=fields[j].tap->expected;
+ fields[j].check_mask=fields[j].tap->expected_mask;
}
}
+ jtag_add_scan_check(jtag_add_ir_scan_noverify, num_fields, fields, state);
}
int MINIDRIVER(interface_jtag_add_ir_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
@@ -733,7 +703,8 @@ static int jtag_check_value_mask_callback(u8 *in, jtag_callback_data_t data1, jt
return jtag_check_value_inner(in, (u8 *)data1, (u8 *)data2, (int)data3);
}
-void jtag_add_dr_scan_check(int num_fields, scan_field_t *fields, tap_state_t state)
+static void jtag_add_scan_check(void (*jtag_add_scan)(int num_fields, scan_field_t *fields, tap_state_t state),
+ int num_fields, scan_field_t *fields, tap_state_t state)
{
for (int i=0; i<num_fields; i++)
{
@@ -759,7 +730,7 @@ void jtag_add_dr_scan_check(int num_fields, scan_field_t *fields, tap_state_t st
}
}
- jtag_add_dr_scan(num_fields, fields, state);
+ jtag_add_scan(num_fields, fields, state);
for (int i=0; i<num_fields; i++)
{
@@ -777,10 +748,16 @@ void jtag_add_dr_scan_check(int num_fields, scan_field_t *fields, tap_state_t st
fields[i].in_value=NULL;
}
}
+}
-
+void jtag_add_dr_scan_check(int num_fields, scan_field_t *fields, tap_state_t state)
+{
+ jtag_add_scan_check(jtag_add_dr_scan, num_fields, fields, state);
}
+
+
+
int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
{
int j;