- convert all files to unix line-ending

git-svn-id: svn://svn.berlios.de/openocd/trunk@347 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 207 insertions, 207 deletions

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 08cf3462..7a9e8786 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -1,207 +1,207 @@
-/***************************************************************************

- *   Copyright (C) 2005 by Dominic Rath                                    *

- *   Dominic.Rath@gmx.de                                                   *

- *                                                                         *

- *   This program is free software; you can redistribute it and/or modify  *

- *   it under the terms of the GNU General Public License as published by  *

- *   the Free Software Foundation; either version 2 of the License, or     *

- *   (at your option) any later version.                                   *

- *                                                                         *

- *   This program is distributed in the hope that it will be useful,       *

- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *

- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *

- *   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.             *

- ***************************************************************************/

-#ifdef HAVE_CONFIG_H

-#include "config.h"

-#endif

-

-#include "arm_jtag.h"

-

-#include "binarybuffer.h"

-#include "log.h"

-#include "jtag.h"

-

-#include <stdlib.h>

-

-#if 0

-#define _ARM_JTAG_SCAN_N_CHECK_

-#endif

-

-int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  in_handler_t handler)

-{

-	jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);

-	

-	if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)

-	{

-		scan_field_t field;

-	

-		field.device = jtag_info->chain_pos;

-		field.num_bits = device->ir_length;

-		field.out_value = calloc(CEIL(field.num_bits, 8), 1);

-		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);

-		field.out_mask = NULL;

-		field.in_value = NULL;

-		field.in_check_value = NULL;

-		field.in_check_mask = NULL;

-		field.in_handler = handler;

-		field.in_handler_priv = NULL;

-		jtag_add_ir_scan(1, &field, -1);

-		

-		

-		free(field.out_value);

-	}

-	

-	return ERROR_OK;

-}

-

-int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)

-{

-	if(jtag_info->cur_scan_chain != new_scan_chain)

-	{

-#ifdef _ARM_JTAG_SCAN_N_CHECK_

-		u8 scan_n_check_value = 1 << (jtag_info->scann_size - 1);

-#endif

-		scan_field_t field;

-		

-		field.device = jtag_info->chain_pos;

-		field.num_bits = jtag_info->scann_size;

-		field.out_value = calloc(CEIL(field.num_bits, 8), 1);

-		buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain);

-		field.out_mask = NULL;

-		field.in_value = NULL;

-#ifdef _ARM_JTAG_SCAN_N_CHECK_

-		jtag_set_check_value(&field, &scan_n_check_value, NULL, NULL, NULL);

-#else

-		field.in_handler = NULL;

-		field.in_handler_priv = NULL;

-#endif 

-		

-		

-		arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);

-		jtag_add_dr_scan(1, &field, -1);

-		

-		jtag_info->cur_scan_chain = new_scan_chain;

-		

-		free(field.out_value);

-	}

-	

-	return ERROR_OK;

-}

-

-int arm_jtag_reset_callback(enum jtag_event event, void *priv)

-{

-	arm_jtag_t *jtag_info = priv;

-	

-	if (event == JTAG_TRST_ASSERTED)

-	{

-		jtag_info->cur_scan_chain = 0;

-	}

-	

-	return ERROR_OK;

-}

-

-int arm_jtag_setup_connection(arm_jtag_t *jtag_info)

-{

-	jtag_info->scann_instr = 0x2;

-	jtag_info->cur_scan_chain = 0;

-	jtag_info->intest_instr = 0xc;

-

-	jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);

-	

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into host-endian u32, flipping bit-order */

-int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	u32 *dest = priv;

-	*dest = flip_u32(le_to_h_u32(in_buf), 32);

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into little-endian u32, flipping bit-order */

-int arm_jtag_buf_to_le32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u32_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32));

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into little-endian u16, flipping bit-order */

-int arm_jtag_buf_to_le16_flip(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u16_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into big-endian u32, flipping bit-order */

-int arm_jtag_buf_to_be32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u32_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32));

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into big-endian u16, flipping bit-order */

-int arm_jtag_buf_to_be16_flip(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u16_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into u8, flipping bit-order */

-int arm_jtag_buf_to_8_flip(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	u8 *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 u32 */

-int arm_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	u32 *dest = priv;

-	*dest = le_to_h_u32(in_buf);

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into little-endian u32 */

-int arm_jtag_buf_to_le32(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u32_to_le(((u8*)priv), le_to_h_u32(in_buf));

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into little-endian u16 */

-int arm_jtag_buf_to_le16(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u16_to_le(((u8*)priv), le_to_h_u32(in_buf) & 0xffff);

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into big-endian u32 */

-int arm_jtag_buf_to_be32(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u32_to_be(((u8*)priv), le_to_h_u32(in_buf));

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into big-endian u16 */

-int arm_jtag_buf_to_be16(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	h_u16_to_be(((u8*)priv), le_to_h_u32(in_buf) & 0xffff);

-	return ERROR_OK;

-}

-

-/* read JTAG buffer into u8 */

-int arm_jtag_buf_to_8(u8 *in_buf, void *priv, struct scan_field_s *field)

-{

-	u8 *dest = priv;

-	*dest = le_to_h_u32(in_buf) & 0xff;

-	return ERROR_OK;

-}

+/***************************************************************************
+ *   Copyright (C) 2005 by Dominic Rath                                    *
+ *   Dominic.Rath@gmx.de                                                   *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   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.             *
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "arm_jtag.h"
+
+#include "binarybuffer.h"
+#include "log.h"
+#include "jtag.h"
+
+#include <stdlib.h>
+
+#if 0
+#define _ARM_JTAG_SCAN_N_CHECK_
+#endif
+
+int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  in_handler_t handler)
+{
+	jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
+	
+	if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
+	{
+		scan_field_t field;
+	
+		field.device = jtag_info->chain_pos;
+		field.num_bits = device->ir_length;
+		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
+		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
+		field.out_mask = NULL;
+		field.in_value = NULL;
+		field.in_check_value = NULL;
+		field.in_check_mask = NULL;
+		field.in_handler = handler;
+		field.in_handler_priv = NULL;
+		jtag_add_ir_scan(1, &field, -1);
+		
+		
+		free(field.out_value);
+	}
+	
+	return ERROR_OK;
+}
+
+int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
+{
+	if(jtag_info->cur_scan_chain != new_scan_chain)
+	{
+#ifdef _ARM_JTAG_SCAN_N_CHECK_
+		u8 scan_n_check_value = 1 << (jtag_info->scann_size - 1);
+#endif
+		scan_field_t field;
+		
+		field.device = jtag_info->chain_pos;
+		field.num_bits = jtag_info->scann_size;
+		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
+		buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain);
+		field.out_mask = NULL;
+		field.in_value = NULL;
+#ifdef _ARM_JTAG_SCAN_N_CHECK_
+		jtag_set_check_value(&field, &scan_n_check_value, NULL, NULL, NULL);
+#else
+		field.in_handler = NULL;
+		field.in_handler_priv = NULL;
+#endif 
+		
+		
+		arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);
+		jtag_add_dr_scan(1, &field, -1);
+		
+		jtag_info->cur_scan_chain = new_scan_chain;
+		
+		free(field.out_value);
+	}
+	
+	return ERROR_OK;
+}
+
+int arm_jtag_reset_callback(enum jtag_event event, void *priv)
+{
+	arm_jtag_t *jtag_info = priv;
+	
+	if (event == JTAG_TRST_ASSERTED)
+	{
+		jtag_info->cur_scan_chain = 0;
+	}
+	
+	return ERROR_OK;
+}
+
+int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
+{
+	jtag_info->scann_instr = 0x2;
+	jtag_info->cur_scan_chain = 0;
+	jtag_info->intest_instr = 0xc;
+
+	jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
+	
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into host-endian u32, flipping bit-order */
+int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	u32 *dest = priv;
+	*dest = flip_u32(le_to_h_u32(in_buf), 32);
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into little-endian u32, flipping bit-order */
+int arm_jtag_buf_to_le32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u32_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32));
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into little-endian u16, flipping bit-order */
+int arm_jtag_buf_to_le16_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u16_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into big-endian u32, flipping bit-order */
+int arm_jtag_buf_to_be32_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u32_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32));
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into big-endian u16, flipping bit-order */
+int arm_jtag_buf_to_be16_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u16_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff);
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into u8, flipping bit-order */
+int arm_jtag_buf_to_8_flip(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	u8 *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 u32 */
+int arm_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	u32 *dest = priv;
+	*dest = le_to_h_u32(in_buf);
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into little-endian u32 */
+int arm_jtag_buf_to_le32(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u32_to_le(((u8*)priv), le_to_h_u32(in_buf));
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into little-endian u16 */
+int arm_jtag_buf_to_le16(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u16_to_le(((u8*)priv), le_to_h_u32(in_buf) & 0xffff);
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into big-endian u32 */
+int arm_jtag_buf_to_be32(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u32_to_be(((u8*)priv), le_to_h_u32(in_buf));
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into big-endian u16 */
+int arm_jtag_buf_to_be16(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	h_u16_to_be(((u8*)priv), le_to_h_u32(in_buf) & 0xffff);
+	return ERROR_OK;
+}
+
+/* read JTAG buffer into u8 */
+int arm_jtag_buf_to_8(u8 *in_buf, void *priv, struct scan_field_s *field)
+{
+	u8 *dest = priv;
+	*dest = le_to_h_u32(in_buf) & 0xff;
+	return ERROR_OK;
+}