First step in hiding target_type_s from public interface:

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

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 12c2094396f4680e53c6185a5652f32c13d2e571..668f2f5e4585115b79d7a0a09023ce98f45941fd 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -21,13 +21,10 @@
 #include "config.h"
 #endif
 
+#define DEFINE_TARGET_TYPE_S
 #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,34 +109,25 @@ 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].out_mask = NULL;
        fields[0].in_value = NULL;
-       fields[0].in_check_value = NULL;
-       fields[0].in_check_mask = NULL;
-       fields[0].in_handler = NULL;
-       fields[0].in_handler_priv = NULL;
 
        fields[1].tap = jtag_info->tap;
        fields[1].num_bits = 32;
        fields[1].out_value = out_buf;
-       fields[1].out_mask = NULL;
        fields[1].in_value = NULL;
+
        if (in)
        {
-               fields[1].in_handler = arm_jtag_buf_to_u32_flip;
-               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;
-               fields[1].in_handler_priv = NULL;
+               jtag_add_dr_scan(2, fields, TAP_INVALID);
        }
-       fields[1].in_check_value = NULL;
-       fields[1].in_check_mask = NULL;
-
-       jtag_add_dr_scan(2, fields, -1);
 
        if (clock)
-               jtag_add_runtest(0, -1);
+               jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
        if((retval = jtag_execute_queue()) != ERROR_OK)