X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fbinarybuffer.h;h=5017a358819110fadb85f7eb04be4941b5ed7a0d;hb=d22270e0ed291d3b08fd03a25181b279ca5e0911;hp=7100b872f9749a4c8cffdf15e162ad6865844058;hpb=68c598e88d5e09728ea845a81ab279c615bbaf0f;p=openocd.git

diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index 7100b872f9..5017a35881 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  *
@@ -30,19 +30,20 @@
  */
 
 /* inlining this will help show what fn that is taking time during profiling. */
-static __inline void buf_set_u32(u8* buffer, unsigned int first, unsigned int num, u32 value)
+static inline void buf_set_u32(uint8_t* buffer,
+		unsigned int first, unsigned int num, uint32_t value)
 {
-	if ((num==32)&&(first==0))
+	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;
+		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++)
+
+		for (i = first; i < first + num; i++)
 		{
 			if (((value >> (i-first))&1) == 1)
 				buffer[i/8] |= 1 << (i%8);
@@ -51,50 +52,53 @@ static __inline void buf_set_u32(u8* buffer, unsigned int first, unsigned int nu
 		}
 	}
 }
-static __inline u32 buf_get_u32(u8* 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 (((u32)buffer[3])<<24)|(((u32)buffer[2])<<16)|(((u32)buffer[1])<<8)|(((u32)buffer[0])<<0);
-	} else
+	if ((num == 32) && (first == 0))
 	{
-		u32 result = 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 (i = first; i < first + num; i++)
 		{
 			if (((buffer[i/8]>>(i%8))&1) == 1)
 				result |= 1 << (i-first);
 		}
-	
+
 		return result;
 	}
 }
 
-extern u32 flip_u32(u32 value, unsigned int num);
+uint32_t flip_u32(uint32_t value, unsigned int num);
 
-extern int buf_cmp(u8 *buf1, u8 *buf2, int size);
-extern int buf_cmp_mask(u8 *buf1, u8 *buf2, u8 *mask, int size);
-extern u8* buf_cpy(u8 *from, u8 *to, int size);
+int buf_cmp(const uint8_t *buf1, const uint8_t *buf2, int size);
+int buf_cmp_mask(const uint8_t *buf1, const uint8_t *buf2,
+		const uint8_t *mask, int size);
+uint8_t* buf_cpy(const uint8_t *from, uint8_t *to, int size);
 
-extern u8* buf_set_ones(u8 *buf, int count);
-extern u8* buf_set_buf(u8 *src, int src_start, u8 *dst, int dst_start, int len);
+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);
 
-extern int str_to_buf(const char *str, int len, u8 *bin_buf, int buf_size, int radix);
-extern char* buf_to_str(const u8 *buf, int size, int radix);
+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;
-extern int buf_to_u32_handler(u8 *in_buf, void *priv, struct scan_field_s *field);
+int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field_s *field);
 
-#define CEIL(m, n)	((m + n - 1) / n)
+#define CEIL(m, n)	(((m) + (n) - 1) / (n))
 
-/* read a u32 from a buffer in target memory endianness */
-static __inline u32 fast_target_buffer_get_u32(u8 *buffer, int little)
+/* read a uint32_t from a buffer in target memory endianness */
+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 */