improve str_to_buf and buf_to_str helpers

[openocd.git] / src / helper / binarybuffer.h

diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index 5017a358819110fadb85f7eb04be4941b5ed7a0d..49050074fb226cd6e82315152a9363b9362a64b9 100644 (file)
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -25,56 +25,49 @@
 
 #include "types.h"
 
-/* support functions to access arbitrary bits in a byte array
- * flip_u32 inverses the bit order inside a 32-bit word (31..0 -> 0..31)
+/** @file
+ * Support functions to access arbitrary bits in a byte array
  */
 
 /* inlining this will help show what fn that is taking time during profiling. */
 static inline void buf_set_u32(uint8_t* buffer,
                unsigned int first, unsigned int num, uint32_t value)
 {
-       if ((num == 32) && (first == 0))
-       {
-               buffer[3]=(value >> 24)&0xff;
-               buffer[2]=(value >> 16)&0xff;
-               buffer[1]=(value >> 8)&0xff;
-               buffer[0]=(value >> 0)&0xff;
-       } else
-       {
-               unsigned int i;
-
-               for (i = first; i < first + num; i++)
+       if ((num == 32) && (first == 0)) {
+               buffer[3] = (value >> 24) & 0xff;
+               buffer[2] = (value >> 16) & 0xff;
+               buffer[1] = (value >> 8) & 0xff;
+               buffer[0] = (value >> 0) & 0xff;
+       } else {
+               for (unsigned i = first; i < first + num; i++)
                {
-                       if (((value >> (i-first))&1) == 1)
-                               buffer[i/8] |= 1 << (i%8);
+                       if (((value >> (i - first)) & 1) == 1)
+                               buffer[i / 8] |= 1 << (i % 8);
                        else
-                               buffer[i/8] &= ~(1 << (i%8));
+                               buffer[i / 8] &= ~(1 << (i % 8));
                }
        }
 }
 static inline uint32_t buf_get_u32(const uint8_t* buffer,
                unsigned int first, unsigned int num)
 {
-       if ((num == 32) && (first == 0))
-       {
+       if ((num == 32) && (first == 0)) {
                return (((uint32_t)buffer[3]) << 24) |
                        (((uint32_t)buffer[2]) << 16) |
                        (((uint32_t)buffer[1]) << 8) |
                        (((uint32_t)buffer[0]) << 0);
        } else {
                uint32_t result = 0;
-               unsigned int i;
-
-               for (i = first; i < first + num; i++)
+               for (unsigned i = first; i < first + num; i++)
                {
-                       if (((buffer[i/8]>>(i%8))&1) == 1)
-                               result |= 1 << (i-first);
+                       if (((buffer[i / 8] >> (i % 8)) & 1) == 1)
+                               result |= 1 << (i - first);
                }
-
                return result;
        }
 }
 
+/// flip_u32 inverts the bit order inside a 32-bit word (31..0 -> 0..31)
 uint32_t flip_u32(uint32_t value, unsigned int num);
 
 int buf_cmp(const uint8_t *buf1, const uint8_t *buf2, int size);
@@ -86,12 +79,9 @@ uint8_t* buf_set_ones(uint8_t *buf, int count);
 uint8_t* buf_set_buf(const uint8_t *src, int src_start,
                uint8_t *dst, int dst_start, int len);
 
-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);
+int str_to_buf(const char *str, unsigned len,
+               void *bin_buf, unsigned buf_size, unsigned radix);
+char* buf_to_str(const void *buf, unsigned size, unsigned radix);
 
 #define CEIL(m, n)     (((m) + (n) - 1) / (n))