Merge branch 'master' of ssh://dbrownell@openocd.git.sourceforge.net/gitroot/openocd...

[fw/openocd] / src / target / arm_jtag.c

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 3c1bb0afbe5e3953f90238db97dbdec378c18af0..d975d9d01725e05a8b0d0f2a07e74ee46094f4e7 100644 (file)
--- 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,11 +31,11 @@
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  void *no_verify_capture)
+int arm_jtag_set_instr(arm_jtag_t *jtag_info, uint32_t new_instr,  void *no_verify_capture)
 {
        jtag_tap_t *tap;
        tap = jtag_info->tap;
-       if (tap==NULL)
+       if (tap == NULL)
                return ERROR_FAIL;
 
        if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
@@ -48,10 +48,10 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  void *no_verify_ca
                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)
+
+               if (no_verify_capture == NULL)
                {
                        jtag_add_ir_scan(1, &field, jtag_get_end_state());
                } else
@@ -66,18 +66,18 @@ int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  void *no_verify_ca
        return ERROR_OK;
 }
 
-int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
+int arm_jtag_scann(arm_jtag_t *jtag_info, uint32_t new_scan_chain)
 {
        int retval = ERROR_OK;
-       if(jtag_info->cur_scan_chain != new_scan_chain)
+       if (jtag_info->cur_scan_chain != new_scan_chain)
        {
-               u32 values[1];
+               uint32_t values[1];
                int num_bits[1];
 
                values[0]=new_scan_chain;
                num_bits[0]=jtag_info->scann_size;
 
-               if((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK)
+               if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK)
                {
                        return retval;
                }
@@ -115,36 +115,36 @@ 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 u32, flipping bit-order */
+/* 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)
 {
-       u32 *dest = priv;
+       uint32_t *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 */
+/* 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 u16, flipping bit-order */
+/* 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 u32, flipping bit-order */
+/* 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 u16, flipping bit-order */
+/* 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);
@@ -160,36 +160,36 @@ int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field_s *fie
 }
 
 /* not-flipping variants */
-/* read JTAG buffer into host-endian u32 */
+/* 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)
 {
-       u32 *dest = priv;
+       uint32_t *dest = priv;
        *dest = le_to_h_u32(in_buf);
        return ERROR_OK;
 }
 
-/* read JTAG buffer into little-endian u32 */
+/* 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 u16 */
+/* 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 u32 */
+/* 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 u16 */
+/* 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);