First step in hiding target_type_s from public interface:

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

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 5f45ad9977e52ac0346bbfeaf51e4eedaf212133..4c86f4a7861a675d6a14802a56abfd55cf398a97 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -27,20 +27,9 @@
 #include "config.h"
 #endif
 
+#define DEFINE_TARGET_TYPE_S
 #include "arm7tdmi.h"
 
-#include "arm7_9_common.h"
-#include "register.h"
-#include "target.h"
-#include "armv4_5.h"
-#include "embeddedice.h"
-#include "etm.h"
-#include "log.h"
-#include "jtag.h"
-#include "arm_jtag.h"
-
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define _DEBUG_INSTRUCTION_EXECUTION_
@@ -115,13 +104,11 @@ int arm7tdmi_examine_debug_reason(target_t *target)
                fields[0].num_bits = 1;
                fields[0].out_value = NULL;
                fields[0].in_value = &breakpoint;
-               fields[0].in_handler = NULL;
 
                fields[1].tap = arm7_9->jtag_info.tap;
                fields[1].num_bits = 32;
                fields[1].out_value = NULL;
                fields[1].in_value = databus;
-               fields[1].in_handler = NULL;
 
                if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
                {
@@ -194,22 +181,15 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
        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 = NULL;
-       u8 tmp[4];
-       fields[1].in_value = tmp;
-       fields[1].in_handler = NULL;
+       fields[1].in_value = (u8 *)in;
 
-       jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+       jtag_add_dr_scan(2, fields, TAP_INVALID);
 
-       if (jtag_error==ERROR_OK)
-       {
-               *in=flip_u32(le_to_h_u32(tmp), 32);
-       }
+       jtag_add_callback(arm7flip32, (u8 *)in);
 
        jtag_add_runtest(0, TAP_INVALID);
 
@@ -263,7 +243,12 @@ void arm_endianness(u8 *tmp, void *in, int size, int be, int flip)
                        *((u8 *)in)= readback & 0xff;
                        break;
        }
+}
 
+static int arm7endianness(u8 *in, jtag_callback_data_t size, jtag_callback_data_t be, jtag_callback_data_t captured)
+{
+       arm_endianness((u8 *)captured, in, (int)size, (int)be, 1);
+       return ERROR_OK;
 }
 
 /* clock the target, and read the databus
@@ -286,18 +271,15 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
        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 = NULL;
-       u8 tmp[4];
-       fields[1].in_value = tmp;
-       fields[1].in_handler = NULL;
+       jtag_alloc_in_value32(&fields[1]);
 
-       jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+       jtag_add_dr_scan(2, fields, TAP_INVALID);
 
-       arm_endianness(tmp, in, size, be, 1);
+       jtag_add_callback4(arm7endianness, in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)fields[1].in_value);
 
        jtag_add_runtest(0, TAP_INVALID);
 
@@ -372,6 +354,13 @@ void arm7tdmi_change_to_arm(target_t *target, u32 *r0, u32 *pc)
        *pc -= 0xa;
 }
 
+
+/* FIX!!! is this a potential performance bottleneck w.r.t. requiring too many
+ * roundtrips when jtag_execute_queue() has a large overhead(e.g. for USB)s?
+ *
+ * The solution is to arrange for a large out/in scan in this loop and
+ * and convert data afterwards.
+ */
 void arm7tdmi_read_core_regs(target_t *target, u32 mask, u32* core_regs[16])
 {
        int i;
@@ -730,7 +719,7 @@ int arm7tdmi_examine(struct target_s *target)
        int retval;
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
-       if (!target->type->examined)
+       if (!target_was_examined(target))
        {
                /* get pointers to arch-specific information */
                reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
@@ -747,7 +736,7 @@ int arm7tdmi_examine(struct target_s *target)
                        (*cache_p)->next = etm_build_reg_cache(target, jtag_info, arm7_9->etm_ctx);
                        arm7_9->etm_ctx->reg_cache = (*cache_p)->next;
                }
-               target->type->examined = 1;
+               target_set_examined(target);
        }
        if ((retval=embeddedice_setup(target))!=ERROR_OK)
                return retval;