Menu
▾
▴
[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-380-ga502676
|
From: Zach W. <zw...@us...> - 2009-11-15 03:24:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via a502676df7e6e99c29f207003ec02a128012d325 (commit)
via bc07ee82fbeb05a93f91d077d0628d4e369c5aeb (commit)
via 4d4b2958a5fdf0dfa0f8199535ccd9bd4e66d4af (commit)
from c2edc7908fc68594761be3bd390aa6bb5335da60 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a502676df7e6e99c29f207003ec02a128012d325
Author: Zachary T Welch <zw...@su...>
Date: Sat Nov 14 06:48:30 2009 -0800
remove unused arm_jtag_buf_to_* helpers
Removes unused arm_jtag_buf_* helpers from arm_jtag.[ch]. These could
reappear if patches are provided to conver the tree to use them, but
this code should not be in the master tree until that series is ready.
diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 54316b7..af626ec 100644
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -114,92 +114,3 @@ int arm_jtag_setup_connection(struct arm_jtag *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 *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 *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 *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 *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 *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 *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 *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 *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 *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 *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 *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 *field)
-{
- uint8_t *dest = priv;
- *dest = le_to_h_u32(in_buf) & 0xff;
- return ERROR_OK;
-}
diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index 46122e4..d9e7f2a 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -41,23 +41,6 @@ int arm_jtag_set_instr(struct arm_jtag *jtag_info,
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 *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 *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 */
static __inline__ void arm7flip32(jtag_callback_data_t arg)
{
commit bc07ee82fbeb05a93f91d077d0628d4e369c5aeb
Author: Zachary T Welch <zw...@su...>
Date: Sat Nov 14 06:41:58 2009 -0800
remove unused buf_to_u32_handler
Purge an unused routine from the tree and remove a layering violation.
If this code is needed, it should reappear somwhere in src/jtag/,
where struct scan_field gets defined.
diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c
index e0e7ac1..fdfcf71 100644
--- a/src/helper/binarybuffer.c
+++ b/src/helper/binarybuffer.c
@@ -327,12 +327,3 @@ 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 *field)
-{
- uint32_t *dest = priv;
-
- *dest = buf_get_u32(in_buf, 0, 32);
-
- return ERROR_OK;
-}
diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index d7c887e..2399a6e 100644
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -90,9 +90,6 @@ 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;
-int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field *field);
-
#define CEIL(m, n) (((m) + (n) - 1) / (n))
/* read a uint32_t from a buffer in target memory endianness */
commit 4d4b2958a5fdf0dfa0f8199535ccd9bd4e66d4af
Author: Zachary T Welch <zw...@su...>
Date: Sat Nov 14 06:30:02 2009 -0800
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.
diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c
index 4b5dfe8..e0e7ac1 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 5017a35..d7c887e 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 e7dbea4..54316b7 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 b1905a3..46122e4 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 */
-----------------------------------------------------------------------
Summary of changes:
src/helper/binarybuffer.c | 9 -----
src/helper/binarybuffer.h | 3 --
src/target/arm_jtag.c | 89 ---------------------------------------------
src/target/arm_jtag.h | 17 ---------
4 files changed, 0 insertions(+), 118 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
