diff options
| author | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-01-20 13:52:06 +0000 |
|---|---|---|
| committer | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-01-20 13:52:06 +0000 |
| commit | 167ce32a7cb99962e6ae8f8c6d36b0999c16888c (patch) | |
| tree | e890df091db83a545d3d0fac021a8da0b2ba2031 /src/helper | |
| parent | 68b97e4b5c40a70b42dc2a970f1b90b9a3e9f13d (diff) | |
| download | openocd+libswd-167ce32a7cb99962e6ae8f8c6d36b0999c16888c.tar.gz openocd+libswd-167ce32a7cb99962e6ae8f8c6d36b0999c16888c.tar.bz2 openocd+libswd-167ce32a7cb99962e6ae8f8c6d36b0999c16888c.tar.xz openocd+libswd-167ce32a7cb99962e6ae8f8c6d36b0999c16888c.zip | |
- added patch "remove error handler as planned"
https://lists.berlios.de/pipermail/openocd-development/2008-January/000665.html
(thanks to oyvind Harboe for the patch)
git-svn-id: svn://svn.berlios.de/openocd/trunk@260 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/binarybuffer.c | 2 | ||||
| -rw-r--r-- | src/helper/binarybuffer.h | 3 | ||||
| -rw-r--r-- | src/helper/interpreter.c | 2 | ||||
| -rw-r--r-- | src/helper/interpreter.h | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c index 7d978915..ddfcced0 100644 --- a/src/helper/binarybuffer.c +++ b/src/helper/binarybuffer.c @@ -371,7 +371,7 @@ int str_to_buf(char* str, int str_len, u8 *buf, int buf_len, int radix) return i; } -int buf_to_u32_handler(u8 *in_buf, void *priv) +int buf_to_u32_handler(u8 *in_buf, void *priv, struct scan_field_s *field) { u32 *dest = priv; diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h index 6f39e7cf..feb5724b 100644 --- a/src/helper/binarybuffer.h +++ b/src/helper/binarybuffer.h @@ -41,7 +41,8 @@ extern u8* buf_set_buf(u8 *src, int src_start, u8 *dst, int dst_start, int len); extern int str_to_buf(char* str, int len, u8 *bin_buf, int buf_size, int radix); extern char* buf_to_str(u8 *buf, int size, int radix); -extern int buf_to_u32_handler(u8 *in_buf, void *priv); +struct scan_field_s; +extern int buf_to_u32_handler(u8 *in_buf, void *priv, struct scan_field_s *field); #define CEIL(m, n) ((m + n - 1) / n) diff --git a/src/helper/interpreter.c b/src/helper/interpreter.c index 85cd7158..e5ce0f00 100644 --- a/src/helper/interpreter.c +++ b/src/helper/interpreter.c @@ -92,7 +92,7 @@ var_t* get_var_by_namenum(char *namenum) } -int field_le_to_host(u8 *buffer, void *priv) +int field_le_to_host(u8 *buffer, void *priv, struct scan_field_s *dummy) { var_field_t *field = priv; field->value = buf_get_u32(buffer, 0, field->num_bits); diff --git a/src/helper/interpreter.h b/src/helper/interpreter.h index 93e8d39d..c4f8acfb 100644 --- a/src/helper/interpreter.h +++ b/src/helper/interpreter.h @@ -40,7 +40,8 @@ typedef struct var_s extern var_t *variables; -extern int field_le_to_host(u8 *buffer, void *priv); +struct scan_field_s; +extern int field_le_to_host(u8 *buffer, void *priv, struct scan_field_s *field); extern var_t* get_var_by_namenum(char *namenum); extern int interpreter_register_commands(struct command_context_s *cmd_ctx); |