In order to get rid of in_handler, I need to submit a series
of patches to remove jtag_set_check_value()
usage.

This is the first in this series. I won't be posting messages
for each of these changes, but I will be making individual
commits.

The individual commits will be useful to do a svn version
bisection if I screw something up...



-- 
Øyvind Harboe
Embedded software and hardware consulting services
http://consulting.zylin.com
Index: C:/workspace/openocd/src/target/embeddedice.c
===================================================================
--- C:/workspace/openocd/src/target/embeddedice.c       (revision 1649)
+++ C:/workspace/openocd/src/target/embeddedice.c       (working copy)
@@ -251,13 +251,9 @@
        fields[0].tap = ice_reg->jtag_info->tap;
        fields[0].num_bits = 32;
        fields[0].out_value = reg->value;
-
        fields[0].in_value = NULL;
-
-
        fields[0].in_handler = NULL;
 
-
        fields[1].tap = ice_reg->jtag_info->tap;
        fields[1].num_bits = 5;
        fields[1].out_value = field1_out;
@@ -262,13 +258,9 @@
        fields[1].num_bits = 5;
        fields[1].out_value = field1_out;
        buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
-
        fields[1].in_value = NULL;
-
-
        fields[1].in_handler = NULL;
 
-
        fields[2].tap = ice_reg->jtag_info->tap;
        fields[2].num_bits = 1;
        fields[2].out_value = field2_out;
@@ -273,17 +265,12 @@
        fields[2].num_bits = 1;
        fields[2].out_value = field2_out;
        buf_set_u32(fields[2].out_value, 0, 1, 0);
-
        fields[2].in_value = NULL;
-
-
        fields[2].in_handler = NULL;
 
-
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
        fields[0].in_value = reg->value;
-       jtag_set_check_value(fields+0, check_value, check_mask, NULL);
 
        /* when reading the DCC data register, leaving the address field set to
         * EICE_COMMS_DATA would read the register twice
@@ -293,6 +280,8 @@
 
        jtag_add_dr_scan(3, fields, TAP_INVALID);
 
+       jtag_check_value_mask(fields+0, check_value, check_mask);
+       
        return ERROR_OK;
 }
 
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to