X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=af626eca6b43531faa533d2eae1d563b0f8eac7f;hb=8a41656391bd8eb6854c8573920d1155d815966b;hp=9df4eeae61620711261d3a70d2899f57e403e6c4;hpb=3813fda44adcea486b7308423a699f63d79273ee;p=openocd.git

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 9df4eeae61..af626eca6b 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -31,16 +31,16 @@
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr(arm_jtag_t *jtag_info, uint32_t new_instr,  void *no_verify_capture)
+int arm_jtag_set_instr(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture)
 {
-	jtag_tap_t *tap;
+	struct jtag_tap *tap;
 	tap = jtag_info->tap;
 	if (tap == NULL)
 		return ERROR_FAIL;
 
 	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
 	{
-		scan_field_t field;
+		struct scan_field field;
 		uint8_t t[4];
 
 		field.tap = tap;
@@ -48,7 +48,7 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, uint32_t new_instr,  void *no_veri
 		field.out_value = t;
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 		field.in_value = NULL;
-		
+
 
 
 		if (no_verify_capture == NULL)
@@ -66,7 +66,7 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, uint32_t new_instr,  void *no_veri
 	return ERROR_OK;
 }
 
-int arm_jtag_scann(arm_jtag_t *jtag_info, uint32_t new_scan_chain)
+int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
 {
 	int retval = ERROR_OK;
 	if (jtag_info->cur_scan_chain != new_scan_chain)
@@ -96,7 +96,7 @@ int arm_jtag_scann(arm_jtag_t *jtag_info, uint32_t new_scan_chain)
 
 int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
-	arm_jtag_t *jtag_info = priv;
+	struct arm_jtag *jtag_info = priv;
 
 	if (event == JTAG_TRST_ASSERTED)
 	{
@@ -106,7 +106,7 @@ int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 	return ERROR_OK;
 }
 
-int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
+int arm_jtag_setup_connection(struct arm_jtag *jtag_info)
 {
 	jtag_info->scann_instr = 0x2;
 	jtag_info->cur_scan_chain = 0;
@@ -114,92 +114,3 @@ int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
 
 	return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }
-
-/* read JTAG buffer into host-endian uint32_t, flipping bit-order */
-int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	uint32_t *dest = priv;
-	*dest = flip_u32(le_to_h_u32(in_buf), 32);
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into little-endian uint32_t, flipping bit-order */
-int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u32_to_le(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32));
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into little-endian uint16_t, flipping bit-order */
-int arm_jtag_buf_to_le16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u16_to_le(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into big-endian uint32_t, flipping bit-order */
-int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u32_to_be(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32));
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into big-endian uint16_t, flipping bit-order */
-int arm_jtag_buf_to_be16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u16_to_be(((uint8_t*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into uint8_t, flipping bit-order */
-int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	uint8_t *dest = priv;
-	*dest = flip_u32(le_to_h_u32(in_buf), 32) & 0xff;
-	return ERROR_OK;
-}
-
-/* not-flipping variants */
-/* read JTAG buffer into host-endian uint32_t */
-int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	uint32_t *dest = priv;
-	*dest = le_to_h_u32(in_buf);
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into little-endian uint32_t */
-int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u32_to_le(((uint8_t*)priv), le_to_h_u32(in_buf));
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into little-endian uint16_t */
-int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u16_to_le(((uint8_t*)priv), le_to_h_u32(in_buf) & 0xffff);
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into big-endian uint32_t */
-int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u32_to_be(((uint8_t*)priv), le_to_h_u32(in_buf));
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into big-endian uint16_t */
-int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	h_u16_to_be(((uint8_t*)priv), le_to_h_u32(in_buf) & 0xffff);
-	return ERROR_OK;
-}
-
-/* read JTAG buffer into uint8_t */
-int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field_s *field)
-{
-	uint8_t *dest = priv;
-	*dest = le_to_h_u32(in_buf) & 0xff;
-	return ERROR_OK;
-}