X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=9b73d4ea8439a80c7b6cb41a3f2c02e59dda9a3b;hb=99db18a995c8ef2913f1397dcc94d0533331e598;hp=8cc44289ab6659cb68a61ae26d994df7b5f72c39;hpb=96949890ee29ab4b3ca15802302c5d93358b69e1;p=openocd.git

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 8cc44289ab..9b73d4ea84 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -16,25 +16,22 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "arm_jtag.h"
 
-
 #if 0
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture, tap_state_t end_state)
+int arm_jtag_set_instr_inner(struct jtag_tap *tap,
+		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
-	struct jtag_tap *tap;
-	tap = jtag_info->tap;
 	struct scan_field field;
 	uint8_t t[4];
 
@@ -44,10 +41,8 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  vo
 	field.in_value = NULL;
 
 	if (no_verify_capture == NULL)
-	{
 		jtag_add_ir_scan(tap, &field, end_state);
-	} else
-	{
+	else {
 		/* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
 		 * have special verification code.
 		 */
@@ -60,21 +55,18 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  vo
 int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
 {
 	int retval = ERROR_OK;
-	uint32_t values[1];
-	int num_bits[1];
 
-	values[0]=new_scan_chain;
-	num_bits[0]=jtag_info->scann_size;
+	uint8_t out_value[4];
+	buf_set_u32(out_value, 0, jtag_info->scann_size, new_scan_chain);
+	struct scan_field field = { .num_bits = jtag_info->scann_size, .out_value = out_value, };
 
-	if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state)) != ERROR_OK)
-	{
+	retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->scann_instr, NULL, end_state);
+	if (retval != ERROR_OK)
 		return retval;
-	}
 
-	jtag_add_dr_out(jtag_info->tap,
+	jtag_add_dr_scan(jtag_info->tap,
 			1,
-			num_bits,
-			values,
+			&field,
 			end_state);
 
 	jtag_info->cur_scan_chain = new_scan_chain;
@@ -82,14 +74,12 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, ta
 	return retval;
 }
 
-int arm_jtag_reset_callback(enum jtag_event event, void *priv)
+static int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
 	struct arm_jtag *jtag_info = priv;
 
 	if (event == JTAG_TRST_ASSERTED)
-	{
 		jtag_info->cur_scan_chain = 0;
-	}
 
 	return ERROR_OK;
 }