David Brownell <david-b@pacbell.net> DaVinci DM355 SoC support

[openocd] / src / target / arm7tdmi.c

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 41b4181a5d2a26b6f9acc2c0ba06b7f9fa62e631..dec3e28dece0b2f9de6dc786c9ae008bc20838e9 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -5,6 +5,9 @@
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   spen@spen-soft.co.uk                                                  *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -43,13 +46,9 @@
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-/* cli handling */
-int arm7tdmi_register_commands(struct command_context_s *cmd_ctx);
-
 /* forward declarations */
 
 int arm7tdmi_target_create(struct target_s *target,Jim_Interp *interp);
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm7tdmi_quit(void);
 
 /* target function declarations */
@@ -115,22 +114,14 @@ int arm7tdmi_examine_debug_reason(target_t *target)
                fields[0].tap = arm7_9->jtag_info.tap;
                fields[0].num_bits = 1;
                fields[0].out_value = NULL;
-               fields[0].out_mask = NULL;
                fields[0].in_value = &breakpoint;
-               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 = arm7_9->jtag_info.tap;
                fields[1].num_bits = 32;
                fields[1].out_value = NULL;
-               fields[1].out_mask = NULL;
                fields[1].in_value = databus;
-               fields[1].in_check_value = NULL;
-               fields[1].in_check_mask = NULL;
                fields[1].in_handler = NULL;
-               fields[1].in_handler_priv = NULL;
 
                if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
                {
@@ -169,9 +160,9 @@ static __inline int arm7tdmi_clock_out_inner(arm_jtag_t *jtag_info, u32 out, int
                        2,
                        arm7tdmi_num_bits,
                        values,
-                       -1);
+                       TAP_INVALID);
 
-       jtag_add_runtest(0, -1);
+       jtag_add_runtest(0, TAP_INVALID);
 
        return ERROR_OK;
 }
@@ -202,26 +193,25 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        fields[0].tap = jtag_info->tap;
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
-       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 = NULL;
-       fields[1].out_mask = NULL;
-       fields[1].in_value = NULL;
-       fields[1].in_handler = arm_jtag_buf_to_u32_flip;
-       fields[1].in_handler_priv = in;
-       fields[1].in_check_value = NULL;
-       fields[1].in_check_mask = NULL;
+       u8 tmp[4];
+       fields[1].in_value = tmp;
+       fields[1].in_handler = NULL;
+
+       jtag_add_dr_scan_now(2, fields, TAP_INVALID);
 
-       jtag_add_dr_scan(2, fields, -1);
+       if (jtag_error==ERROR_OK)
+       {
+               *in=flip_u32(le_to_h_u32(tmp), 32);
+       }
 
-       jtag_add_runtest(0, -1);
+       jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {
@@ -263,37 +253,45 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
        fields[0].tap = jtag_info->tap;
        fields[0].num_bits = 1;
        fields[0].out_value = NULL;
-       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 = NULL;
-       fields[1].out_mask = NULL;
-       fields[1].in_value = NULL;
+       u8 tmp[4];
+       fields[1].in_value = tmp;
+       fields[1].in_handler = NULL;
+
+       jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+
+       u32 readback=flip_u32(le_to_h_u32(tmp), 32);
        switch (size)
        {
                case 4:
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip;
+                       if (be)
+                       {
+                               h_u32_to_be(((u8*)in), readback);
+                       } else
+                       {
+                                h_u32_to_le(((u8*)in), readback);
+                       }
                        break;
                case 2:
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip;
+                       if (be)
+                       {
+                               h_u16_to_be(((u8*)in), readback & 0xffff);
+                       } else
+                       {
+                               h_u16_to_le(((u8*)in), readback & 0xffff);
+                       }
                        break;
                case 1:
-                       fields[1].in_handler = arm_jtag_buf_to_8_flip;
+                       *((u8 *)in)= readback & 0xff;
                        break;
        }
-       fields[1].in_handler_priv = in;
-       fields[1].in_check_value = NULL;
-       fields[1].in_check_mask = NULL;
-
-       jtag_add_dr_scan(2, fields, -1);
 
-       jtag_add_runtest(0, -1);
+       jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
 {