- add missing svn props from svn 1798 commit

[fw/openocd] / src / target / arm720t.c

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 3cbb653ffa003e939f0dcd777a2a7768ca3d6611..37663302abac5e43a67cabfb8f062be99995d2b0 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -22,12 +22,8 @@
 #endif
 
 #include "arm720t.h"
-#include "jtag.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
@@ -112,31 +108,22 @@ int arm720t_scan_cp15(target_t *target, u32 out, u32 *in, int instruction, int c
        fields[0].tap = jtag_info->tap;
        fields[0].num_bits = 1;
        fields[0].out_value = &instruction_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 = out_buf;
-       
        fields[1].in_value = NULL;
+
        if (in)
        {
-               fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
-               fields[1].in_handler_priv = in;
+               fields[1].in_value = (u8 *)in;
+               jtag_add_dr_scan(2, fields, TAP_INVALID);
+               jtag_add_callback(arm7flip32, (u8 *)in);
        } else
        {
-               fields[1].in_handler = NULL;
-               
+               jtag_add_dr_scan(2, fields, TAP_INVALID);
        }
-       
-       
-
-       jtag_add_dr_scan(2, fields, TAP_INVALID);
 
        if (clock)
                jtag_add_runtest(0, TAP_INVALID);