From 1497e6699ae1757e223d1de3d1642a4978118be6 Mon Sep 17 00:00:00 2001 From: zwelch Date: Mon, 8 Jun 2009 10:56:36 +0000 Subject: [PATCH] Simplify jtag_add_dr_scan: - Use jtag_set_error instead of accessing jtag_error directly. - Wrap function arguments to fit everything in 80 columns. - Move retval variable to location of first use. git-svn-id: svn://svn.berlios.de/openocd/trunk@2120 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jtag.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index f8a2da91..841083b9 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -553,23 +553,19 @@ void jtag_add_dr_scan_check(int in_num_fields, scan_field_t *in_fields, tap_stat /** - * Generate a DR SCAN using the fields passed to the function - * - * For not bypassed TAPs the function checks in_fields and uses fields specified there. - * For bypassed TAPs the function generates a dummy 1bit field. - * - * The bypass status of TAPs is set by jtag_add_ir_scan(). - * + * Generate a DR SCAN using the fields passed to the function. + * For connected TAPs, the function checks in_fields and uses fields + * specified there. For bypassed TAPs, the function generates a dummy + * 1-bit field. The bypass status of TAPs is set by jtag_add_ir_scan(). */ -void jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state) +void jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields, + tap_state_t state) { - int retval; - jtag_prelude(state); - retval=interface_jtag_add_dr_scan(in_num_fields, in_fields, state); - if (retval!=ERROR_OK) - jtag_error=retval; + int retval; + retval = interface_jtag_add_dr_scan(in_num_fields, in_fields, state); + jtag_set_error(retval); } -- 2.39.5