X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fbinarybuffer.h;h=07a586248fafaaf178889468db2ec4a7393049a0;hp=dede72d5b67696ac4a78eb5a3f9ce8202062e9c9;hb=d09e308130619f8667b6f08399cfc7d16dddab36;hpb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa

diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index dede72d5b6..07a586248f 100644
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -2,7 +2,7 @@
  *   Copyright (C) 2004, 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  *
@@ -25,76 +25,71 @@
 
 #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)
+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)
+static inline uint32_t buf_get_u32(const uint8_t* buffer,
+		unsigned int first, unsigned int num)
 {
-	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
-	{
+	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;
 	}
 }
 
-extern uint32_t flip_u32(uint32_t value, unsigned int num);
+/// 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);
 
-extern int buf_cmp(const uint8_t *buf1, const uint8_t *buf2, int size);
-extern int buf_cmp_mask(const uint8_t *buf1, const uint8_t *buf2, const uint8_t *mask, int size);
-extern uint8_t* buf_cpy(const uint8_t *from, uint8_t *to, int size);
+bool buf_cmp(const void *buf1, const void *buf2, unsigned size);
+bool buf_cmp_mask(const void *buf1, const void *buf2,
+		const void *mask, unsigned size);
 
-extern uint8_t* buf_set_ones(uint8_t *buf, int count);
-extern uint8_t* buf_set_buf(const uint8_t *src, int src_start, uint8_t *dst, int dst_start, int len);
+void* buf_cpy(const void *from, void *to, unsigned size);
 
-extern int str_to_buf(const char *str, int len, uint8_t *bin_buf, int buf_size, int radix);
-extern char* buf_to_str(const uint8_t *buf, int size, int radix);
+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);
 
-struct scan_field_s;
-extern 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)
+#define CEIL(m, n)	(((m) + (n) - 1) / (n))
 
 /* read a uint32_t from a buffer in target memory endianness */
-static inline uint32_t fast_target_buffer_get_u32(const uint8_t *buffer, int little)
+static inline uint32_t fast_target_buffer_get_u32(const uint8_t *p, int le)
 {
-	if (little)
-		return le_to_h_u32(buffer);
-	else
-		return be_to_h_u32(buffer);
+	return le ? le_to_h_u32(p) : be_to_h_u32(p);
 }
 
 #endif /* BINARYBUFFER_H */