aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2011-12-13 23:21:06 +0100
committerSpencer Oliver <spen@spen-soft.co.uk>2011-12-20 16:56:16 +0000
commit991ed5a2b657e660f744eefddb084724e52938ea (patch)
tree939e71ffef775393e278658718a53a62f8ea74b9
parentc132304ee9fe43c3078caaf64ae0ee2f3a9542fe (diff)
downloadriscv-openocd-991ed5a2b657e660f744eefddb084724e52938ea.zip
riscv-openocd-991ed5a2b657e660f744eefddb084724e52938ea.tar.gz
riscv-openocd-991ed5a2b657e660f744eefddb084724e52938ea.tar.bz2
jtag: retire jtag_alloc_in_value32 API
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>
-rw-r--r--src/target/arm7tdmi.c8
-rw-r--r--src/target/arm9tdmi.c8
2 files changed, 12 insertions, 4 deletions
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index f4ba44a..3ede36c 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 5c2fd9d..dc18585 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);