From 991ed5a2b657e660f744eefddb084724e52938ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= <oyvind.harboe@zylin.com> Date: Tue, 13 Dec 2011 23:21:06 +0100 Subject: [PATCH] jtag: retire jtag_alloc_in_value32 API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit not needed, reduce area of interface and sharp edges to API. Change-Id: I5347352e7595686634bd0de13fcf6de6e55027b0 Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com> Reviewed-on: http://openocd.zylin.com/262 Tested-by: jenkins Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk> --- src/target/arm7tdmi.c | 8 ++++++-- src/target/arm9tdmi.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index f4ba44ac1..3ede36cc9 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -236,11 +236,15 @@ static int arm7tdmi_clock_data_in_endianness(struct arm_jtag *jtag_info, fields[1].num_bits = 32; fields[1].out_value = NULL; - jtag_alloc_in_value32(&fields[1]); + fields[1].in_value = in; jtag_add_dr_scan(jtag_info->tap, 2, fields, TAP_DRPAUSE); - jtag_add_callback4(arm7endianness, (jtag_callback_data_t)in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)fields[1].in_value); + jtag_add_callback4(arm7endianness, + (jtag_callback_data_t)in, + (jtag_callback_data_t)size, + (jtag_callback_data_t)be, + (jtag_callback_data_t)in); jtag_add_runtest(0, TAP_DRPAUSE); diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 5c2fd9d14..dc18585c8 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -293,7 +293,7 @@ int arm9tdmi_clock_data_in_endianness(struct arm_jtag *jtag_info, fields[0].num_bits = 32; fields[0].out_value = NULL; - jtag_alloc_in_value32(&fields[0]); + fields[0].in_value = in; fields[1].num_bits = 3; fields[1].out_value = NULL; @@ -305,7 +305,11 @@ int arm9tdmi_clock_data_in_endianness(struct arm_jtag *jtag_info, jtag_add_dr_scan(jtag_info->tap, 3, fields, TAP_DRPAUSE); - jtag_add_callback4(arm9endianness, (jtag_callback_data_t)in, (jtag_callback_data_t)size, (jtag_callback_data_t)be, (jtag_callback_data_t)fields[0].in_value); + jtag_add_callback4(arm9endianness, + (jtag_callback_data_t)in, + (jtag_callback_data_t)size, + (jtag_callback_data_t)be, + (jtag_callback_data_t)in); jtag_add_runtest(0, TAP_DRPAUSE); -- GitLab