more in_handler typo fixes

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

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index c0446f23554b05f5bb5d31ae5d15ae653db41d05..5f45ad9977e52ac0346bbfeaf51e4eedaf212133 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -234,6 +234,38 @@ int arm7tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in)
        return ERROR_OK;
 }
 
+void arm_endianness(u8 *tmp, void *in, int size, int be, int flip)
+{
+       u32 readback=le_to_h_u32(tmp);
+       if (flip)
+               readback=flip_u32(readback, 32);
+       switch (size)
+       {
+               case 4:
+                       if (be)
+                       {
+                               h_u32_to_be(((u8*)in), readback);
+                       } else
+                       {
+                                h_u32_to_le(((u8*)in), readback);
+                       }
+                       break;
+               case 2:
+                       if (be)
+                       {
+                               h_u16_to_be(((u8*)in), readback & 0xffff);
+                       } else
+                       {
+                               h_u16_to_le(((u8*)in), readback & 0xffff);
+                       }
+                       break;
+               case 1:
+                       *((u8 *)in)= readback & 0xff;
+                       break;
+       }
+
+}
+
 /* clock the target, and read the databus
  * the *in pointer points to a buffer where elements of 'size' bytes
  * are stored in big (be==1) or little (be==0) endianness
@@ -256,28 +288,16 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
        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;
-       fields[1].in_value = NULL;
-       switch (size)
-       {
-               case 4:
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip; /* deprecated! invoke this from user code! */
-                       break;
-               case 2:
-                       fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip; /* deprecated! invoke this from user code! */
-                       break;
-               case 1:
-                       fields[1].in_handler = arm_jtag_buf_to_8_flip; /* deprecated! invoke this from user code! */
-                       break;
-       }
-       fields[1].in_handler_priv = in;
-
+       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, TAP_INVALID);
+       arm_endianness(tmp, in, size, be, 1);
 
        jtag_add_runtest(0, TAP_INVALID);