From 7e546bb91fe663461bf4a3d85380807c3659cee2 Mon Sep 17 00:00:00 2001 From: oharboe Date: Thu, 7 May 2009 13:50:37 +0000 Subject: [PATCH] remove in_handler usage git-svn-id: svn://svn.berlios.de/openocd/trunk@1644 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/arm7tdmi.c | 56 ++++++++++++++++++++++++------------------- src/target/arm9tdmi.c | 52 ++++++++++------------------------------ 2 files changed, 44 insertions(+), 64 deletions(-) diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index dec3e28d..aac1fef6 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -234,6 +234,36 @@ 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) +{ + u32 readback=flip_u32(le_to_h_u32(tmp), 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 @@ -265,31 +295,7 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, jtag_add_dr_scan_now(2, fields, TAP_INVALID); - u32 readback=flip_u32(le_to_h_u32(tmp), 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; - } + arm_endianness(tmp, in, size, be); jtag_add_runtest(0, TAP_INVALID); diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 6e136444..73f0879f 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -283,34 +283,25 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in) fields[0].tap = jtag_info->tap; fields[0].num_bits = 32; fields[0].out_value = NULL; - - fields[0].in_value = NULL; - fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */ - fields[0].in_handler_priv = in; - - + u8 tmp[4]; + fields[0].in_value = tmp; + fields[0].in_handler = NULL; fields[1].tap = jtag_info->tap; fields[1].num_bits = 3; fields[1].out_value = NULL; - fields[1].in_value = NULL; fields[1].in_handler = NULL; - - - fields[2].tap = jtag_info->tap; fields[2].num_bits = 32; fields[2].out_value = NULL; - fields[2].in_value = NULL; - - fields[2].in_handler = NULL; + jtag_add_dr_scan_now(3, fields, TAP_INVALID); - jtag_add_dr_scan(3, fields, TAP_INVALID); + *in=flip_u32(le_to_h_u32(tmp), 32); jtag_add_runtest(0, TAP_INVALID); @@ -335,6 +326,8 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in) return ERROR_OK; } +extern void arm_endianness(u8 *tmp, void *in, int size, int be); + /* 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 @@ -355,45 +348,26 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, fields[0].tap = jtag_info->tap; fields[0].num_bits = 32; fields[0].out_value = NULL; - - fields[0].in_value = NULL; - switch (size) - { - case 4: - fields[0].in_handler = (be) ? arm_jtag_buf_to_be32 : arm_jtag_buf_to_le32; /* deprecated! invoke this from user code! */ - break; - case 2: - fields[0].in_handler = (be) ? arm_jtag_buf_to_be16 : arm_jtag_buf_to_le16; /* deprecated! invoke this from user code! */ - break; - case 1: - fields[0].in_handler = arm_jtag_buf_to_8; /* deprecated! invoke this from user code! */ - break; - } - fields[0].in_handler_priv = in; - - + u8 tmp[4]; + fields[0].in_value = tmp; + fields[0].in_handler = NULL; fields[1].tap = jtag_info->tap; fields[1].num_bits = 3; fields[1].out_value = NULL; - fields[1].in_value = NULL; fields[1].in_handler = NULL; - - - fields[2].tap = jtag_info->tap; fields[2].num_bits = 32; fields[2].out_value = NULL; - fields[2].in_value = NULL; - - fields[2].in_handler = NULL; + jtag_add_dr_scan_now(3, fields, TAP_INVALID); + + arm_endianness(tmp, in, size, be); - jtag_add_dr_scan(3, fields, TAP_INVALID); jtag_add_runtest(0, TAP_INVALID); -- 2.39.5