From 4d4b2958a5fdf0dfa0f8199535ccd9bd4e66d4af Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Sat, 14 Nov 2009 06:30:02 -0800 Subject: [PATCH] struct scan_field_s -> struct scan_field Remove obsolete suffix from struct scan_field. Somehow, these definitions did not get updated but did not cause any errors. --- src/helper/binarybuffer.c | 2 +- src/helper/binarybuffer.h | 4 ++-- src/target/arm_jtag.c | 24 ++++++++++++------------ src/target/arm_jtag.h | 24 ++++++++++++------------ 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c index 4b5dfe82..e0e7ac16 100644 --- a/src/helper/binarybuffer.c +++ b/src/helper/binarybuffer.c @@ -328,7 +328,7 @@ int str_to_buf(const char *str, int str_len, uint8_t *buf, int buf_len, int radi return i; } -int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field_s *field) +int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field *field) { uint32_t *dest = priv; diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h index 5017a358..d7c887e7 100644 --- a/src/helper/binarybuffer.h +++ b/src/helper/binarybuffer.h @@ -90,8 +90,8 @@ int str_to_buf(const char *str, int len, uint8_t *bin_buf, int buf_size, int radix); char* buf_to_str(const uint8_t *buf, int size, int radix); -struct scan_field_s; -int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field_s *field); +struct scan_field; +int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field *field); #define CEIL(m, n) (((m) + (n) - 1) / (n)) diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c index e7dbea4f..54316b70 100644 --- a/src/target/arm_jtag.c +++ b/src/target/arm_jtag.c @@ -116,7 +116,7 @@ int arm_jtag_setup_connection(struct arm_jtag *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) +int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field *field) { uint32_t *dest = priv; *dest = flip_u32(le_to_h_u32(in_buf), 32); @@ -124,35 +124,35 @@ int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *f } /* 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) +int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_le16_flip(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_be16_flip(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field *field) { uint8_t *dest = priv; *dest = flip_u32(le_to_h_u32(in_buf), 32) & 0xff; @@ -161,7 +161,7 @@ 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 uint32_t */ -int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field) +int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field *field) { uint32_t *dest = priv; *dest = le_to_h_u32(in_buf); @@ -169,35 +169,35 @@ int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field) } /* 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) +int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field *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) +int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field *field) { uint8_t *dest = priv; *dest = le_to_h_u32(in_buf) & 0xff; diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h index b1905a3d..46122e46 100644 --- a/src/target/arm_jtag.h +++ b/src/target/arm_jtag.h @@ -42,20 +42,20 @@ int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain); int arm_jtag_setup_connection(struct arm_jtag *jtag_info); /* JTAG buffers to host, be and le buffers, flipping variants */ -int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_le16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_be16_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field); +int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_le16_flip(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_be16_flip(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field *field); /* JTAG buffers to host, be and le buffers */ -int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field_s *field); -int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field_s *field); +int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field *field); +int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field *field); /* use this as a static so we can inline it in -O3 and refer to it via a pointer */ -- 2.39.5