Transform 'u8' to 'uint8_t'

- Replace '\([^_]\)u8' with '\1uint8_t'.
- Replace '^u8' with 'uint8_t'.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2276 b42882b7-edfa-0310-969c-e2dbd0fdcd60

5 files changed, 52 insertions, 52 deletions

diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c
index 87b9fa7..f2ca471 100644
--- a/src/helper/binarybuffer.c
+++ b/src/helper/binarybuffer.c
@@ -48,7 +48,7 @@ const unsigned char bit_reverse_table256[] =
 };
 
 
-u8* buf_cpy(const u8 *from, u8 *to, int size)
+uint8_t* buf_cpy(const uint8_t *from, uint8_t *to, int size)
 {
 	unsigned int num_bytes = CEIL(size, 8);
 	unsigned int i;
@@ -68,7 +68,7 @@ u8* buf_cpy(const u8 *from, u8 *to, int size)
 	return to;
 }
 
-int buf_cmp(const u8 *buf1, const u8 *buf2, int size)
+int buf_cmp(const uint8_t *buf1, const uint8_t *buf2, int size)
 {
 	int num_bytes = CEIL(size, 8);
 	int i;
@@ -95,7 +95,7 @@ int buf_cmp(const u8 *buf1, const u8 *buf2, int size)
 	return 0;
 }
 
-int buf_cmp_mask(const u8 *buf1, const u8 *buf2, const u8 *mask, int size)
+int buf_cmp_mask(const uint8_t *buf1, const uint8_t *buf2, const uint8_t *mask, int size)
 {
 	int num_bytes = CEIL(size, 8);
 	int i;
@@ -120,7 +120,7 @@ int buf_cmp_mask(const u8 *buf1, const u8 *buf2, const u8 *mask, int size)
 	return 0;
 }
 
-u8* buf_set_ones(u8 *buf, int count)
+uint8_t* buf_set_ones(uint8_t *buf, int count)
 {
 	int num_bytes = CEIL(count, 8);
 	int i;
@@ -138,7 +138,7 @@ u8* buf_set_ones(u8 *buf, int count)
 	return buf;
 }
 
-u8* buf_set_buf(const u8 *src, int src_start, u8 *dst, int dst_start, int len)
+uint8_t* buf_set_buf(const uint8_t *src, int src_start, uint8_t *dst, int dst_start, int len)
 {
 	int src_idx = src_start, dst_idx = dst_start;
 	int i;
@@ -186,7 +186,7 @@ int ceil_f_to_u32(float x)
 	return y;
 }
 
-char* buf_to_str(const u8 *buf, int buf_len, int radix)
+char* buf_to_str(const uint8_t *buf, int buf_len, int radix)
 {
 	const char *DIGITS = "0123456789ABCDEF";
 	float factor;
@@ -225,7 +225,7 @@ char* buf_to_str(const u8 *buf, int buf_len, int radix)
 		for (j = str_len; j > 0; j--)
 		{
 			tmp += (u32)str[j-1] * 256;
-			str[j-1] = (u8)(tmp % radix);
+			str[j-1] = (uint8_t)(tmp % radix);
 			tmp /= radix;
 		}
 	}
@@ -236,12 +236,12 @@ char* buf_to_str(const u8 *buf, int buf_len, int radix)
 	return str;
 }
 
-int str_to_buf(const char *str, int str_len, u8 *buf, int buf_len, int radix)
+int str_to_buf(const char *str, int str_len, uint8_t *buf, int buf_len, int radix)
 {
 	char *charbuf;
 	u32 tmp;
 	float factor;
-	u8 *b256_buf;
+	uint8_t *b256_buf;
 	int b256_len;
 
 	int j; /* base-256 digits */
@@ -304,7 +304,7 @@ int str_to_buf(const char *str, int str_len, u8 *buf, int buf_len, int radix)
 		for (j = 0; j < b256_len; j++)
 		{
 			tmp += (u32)b256_buf[j] * radix;
-			b256_buf[j] = (u8)(tmp & 0xFF);
+			b256_buf[j] = (uint8_t)(tmp & 0xFF);
 			tmp >>= 8;
 		}
 
@@ -328,7 +328,7 @@ int str_to_buf(const char *str, int str_len, u8 *buf, int buf_len, int radix)
 	return i;
 }
 
-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)
 {
 	u32 *dest = priv;
 
diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index 3305caf..49ea6b3 100644
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -30,7 +30,7 @@
  */
 
 /* 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, u32 value)
 {
 	if ((num==32)&&(first==0))
 	{
@@ -51,7 +51,7 @@ static inline void buf_set_u32(u8* buffer, unsigned int first, unsigned int num,
 		}
 	}
 }
-static inline u32 buf_get_u32(const u8* buffer, unsigned int first, unsigned int num)
+static inline u32 buf_get_u32(const uint8_t* buffer, unsigned int first, unsigned int num)
 {
 	if ((num==32)&&(first==0))
 	{
@@ -73,23 +73,23 @@ static inline u32 buf_get_u32(const u8* buffer, unsigned int first, unsigned int
 
 extern u32 flip_u32(u32 value, unsigned int num);
 
-extern int buf_cmp(const u8 *buf1, const u8 *buf2, int size);
-extern int buf_cmp_mask(const u8 *buf1, const u8 *buf2, const u8 *mask, int size);
-extern u8* buf_cpy(const u8 *from, u8 *to, int size);
+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);
 
-extern u8* buf_set_ones(u8 *buf, int count);
-extern u8* buf_set_buf(const u8 *src, int src_start, u8 *dst, int dst_start, int len);
+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);
 
-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);
+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);
 
 struct scan_field_s;
-extern int buf_to_u32_handler(u8 *in_buf, void *priv, struct scan_field_s *field);
+extern int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field_s *field);
 
 #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(const u8 *buffer, int little)
+static inline u32 fast_target_buffer_get_u32(const uint8_t *buffer, int little)
 {
 	if (little)
 		return le_to_h_u32(buffer);
diff --git a/src/helper/fileio.c b/src/helper/fileio.c
index 3a11152..b3a9bfe 100644
--- a/src/helper/fileio.c
+++ b/src/helper/fileio.c
@@ -155,21 +155,21 @@ int fileio_seek(fileio_t *fileio, u32 position)
 	return ERROR_OK;
 }
 
-static inline int fileio_local_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
+static inline int fileio_local_read(fileio_t *fileio, u32 size, uint8_t *buffer, u32 *size_read)
 {
 	*size_read = fread(buffer, 1, size, fileio->file);
 	
 	return ERROR_OK;
 }
 
-int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read)
+int fileio_read(fileio_t *fileio, u32 size, uint8_t *buffer, u32 *size_read)
 {
 	return fileio_local_read(fileio, size, buffer, size_read);
 }
 
 int fileio_read_u32(fileio_t *fileio, u32 *data)
 {
-	u8 buf[4];
+	uint8_t buf[4];
 	u32 size_read;
 	int retval;
 	
@@ -193,14 +193,14 @@ int fileio_fgets(fileio_t *fileio, u32 size, char *buffer)
 	return fileio_local_fgets(fileio, size, buffer);
 }
 
-static inline int fileio_local_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written)
+static inline int fileio_local_write(fileio_t *fileio, u32 size, const uint8_t *buffer, u32 *size_written)
 {
 	*size_written = fwrite(buffer, 1, size, fileio->file);
 	
 	return ERROR_OK;
 }
 
-int fileio_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written)
+int fileio_write(fileio_t *fileio, u32 size, const uint8_t *buffer, u32 *size_written)
 {
 	int retval;
 	
@@ -214,7 +214,7 @@ int fileio_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written
 
 int fileio_write_u32(fileio_t *fileio, u32 data)
 {
-	u8 buf[4];
+	uint8_t buf[4];
 	u32 size_written;
 	int retval;
 	
diff --git a/src/helper/fileio.h b/src/helper/fileio.h
index e62f0ba..9913767 100644
--- a/src/helper/fileio.h
+++ b/src/helper/fileio.h
@@ -54,8 +54,8 @@ typedef struct fileio_s
 	FILE *file;
 } fileio_t;
 
-extern int fileio_write(fileio_t *fileio, u32 size, const u8 *buffer, u32 *size_written);
-extern int fileio_read(fileio_t *fileio, u32 size, u8 *buffer, u32 *size_read);
+extern int fileio_write(fileio_t *fileio, u32 size, const uint8_t *buffer, u32 *size_written);
+extern int fileio_read(fileio_t *fileio, u32 size, uint8_t *buffer, u32 *size_read);
 extern int fileio_fgets(fileio_t *fileio, u32 size, char *buffer);
 extern int fileio_seek(fileio_t *fileio, u32 position);
 extern int fileio_close(fileio_t *fileio);
diff --git a/src/helper/types.h b/src/helper/types.h
index 4993318..4ea66e2 100644
--- a/src/helper/types.h
+++ b/src/helper/types.h
@@ -30,8 +30,8 @@
 #include <stdint.h>
 #endif
 
-#ifndef u8
-typedef unsigned char u8;
+#ifndef uint8_t
+typedef unsigned char uint8_t;
 #endif
 
 #ifndef u16
@@ -88,52 +88,52 @@ typedef bool _Bool;
  */
 
 
-static inline u32 le_to_h_u32(const u8* buf)
+static inline u32 le_to_h_u32(const uint8_t* buf)
 {
 	return (u32)(buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24);
 }
 
-static inline u16 le_to_h_u16(const u8* buf)
+static inline u16 le_to_h_u16(const uint8_t* buf)
 {
 	return (u16)(buf[0] | buf[1] << 8);
 }
 
-static inline u32 be_to_h_u32(const u8* buf)
+static inline u32 be_to_h_u32(const uint8_t* buf)
 {
 	return (u32)(buf[3] | buf[2] << 8 | buf[1] << 16 | buf[0] << 24);
 }
 
-static inline u16 be_to_h_u16(const u8* buf)
+static inline u16 be_to_h_u16(const uint8_t* buf)
 {
 	return (u16)(buf[1] | buf[0] << 8);
 }
 
-static inline void h_u32_to_le(u8* buf, int val)
+static inline void h_u32_to_le(uint8_t* buf, int val)
 {
-	buf[3] = (u8) (val >> 24);
-	buf[2] = (u8) (val >> 16);
-	buf[1] = (u8) (val >> 8);
-	buf[0] = (u8) (val >> 0);
+	buf[3] = (uint8_t) (val >> 24);
+	buf[2] = (uint8_t) (val >> 16);
+	buf[1] = (uint8_t) (val >> 8);
+	buf[0] = (uint8_t) (val >> 0);
 }
 
-static inline void h_u32_to_be(u8* buf, int val)
+static inline void h_u32_to_be(uint8_t* buf, int val)
 {
-	buf[0] = (u8) (val >> 24);
-	buf[1] = (u8) (val >> 16);
-	buf[2] = (u8) (val >> 8);
-	buf[3] = (u8) (val >> 0);
+	buf[0] = (uint8_t) (val >> 24);
+	buf[1] = (uint8_t) (val >> 16);
+	buf[2] = (uint8_t) (val >> 8);
+	buf[3] = (uint8_t) (val >> 0);
 }
 
-static inline void h_u16_to_le(u8* buf, int val)
+static inline void h_u16_to_le(uint8_t* buf, int val)
 {
-	buf[1] = (u8) (val >> 8);
-	buf[0] = (u8) (val >> 0);
+	buf[1] = (uint8_t) (val >> 8);
+	buf[0] = (uint8_t) (val >> 0);
 }
 
-static inline void h_u16_to_be(u8* buf, int val)
+static inline void h_u16_to_be(uint8_t* buf, int val)
 {
-	buf[0] = (u8) (val >> 8);
-	buf[1] = (u8) (val >> 0);
+	buf[0] = (uint8_t) (val >> 8);
+	buf[1] = (uint8_t) (val >> 0);
 }
 
 #ifdef __ECOS