From 86e4324f1bd4cd8135cb857e4b940b1f2e872dc3 Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Thu, 18 Jun 2009 07:11:11 +0000
Subject: Finish transforming 'u32' to 'uint32_t'. - Replace '\([^_]\)u32' with
 '\1uint32_t'. - Replace '^u32' with 'uint32_t'.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2281 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/pld/virtex2.c    | 14 +++++++-------
 src/pld/xilinx_bit.c |  2 +-
 src/pld/xilinx_bit.h |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/pld')

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 57af0f18..6e06622b 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -38,7 +38,7 @@ pld_driver_t virtex2_pld =
 	.load = virtex2_load,
 };
 
-static int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
+static int virtex2_set_instr(jtag_tap_t *tap, uint32_t new_instr)
 {
 	if (tap == NULL)
 		return ERROR_FAIL;
@@ -62,7 +62,7 @@ static int virtex2_set_instr(jtag_tap_t *tap, u32 new_instr)
 }
 
 static int virtex2_send_32(struct pld_device_s *pld_device,
-		int num_words, u32 *words)
+		int num_words, uint32_t *words)
 {
 	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
 	scan_field_t scan_field;
@@ -90,11 +90,11 @@ static int virtex2_send_32(struct pld_device_s *pld_device,
 
 static __inline__ void virtexflip32(uint8_t *in)
 {
-	*((u32 *)in) = flip_u32(le_to_h_u32(in), 32);
+	*((uint32_t *)in) = flip_u32(le_to_h_u32(in), 32);
 }
 
 static int virtex2_receive_32(struct pld_device_s *pld_device,
-		int num_words, u32 *words)
+		int num_words, uint32_t *words)
 {
 	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
 	scan_field_t scan_field;
@@ -120,9 +120,9 @@ static int virtex2_receive_32(struct pld_device_s *pld_device,
 	return ERROR_OK;
 }
 
-static int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
+static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
 {
-	u32 data[5];
+	uint32_t data[5];
 
 	jtag_add_tlr();
 
@@ -193,7 +193,7 @@ static int virtex2_handle_read_stat_command(struct command_context_s *cmd_ctx,
 {
 	pld_device_t *device;
 	virtex2_pld_device_t *virtex2_info;
-	u32 status;
+	uint32_t status;
 
 	if (argc < 1)
 	{
diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 5dacdac3..84dc1dfc 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -29,7 +29,7 @@
 
 
 static int read_section(FILE *input_file, int length_size, char section,
-		u32 *buffer_length, uint8_t **buffer)
+		uint32_t *buffer_length, uint8_t **buffer)
 {
 	uint8_t length_buffer[4];
 	int length;
diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h
index 6e002c46..f9b96a7b 100644
--- a/src/pld/xilinx_bit.h
+++ b/src/pld/xilinx_bit.h
@@ -29,7 +29,7 @@ typedef struct xilinx_bit_file_s
 	uint8_t *part_name;
 	uint8_t *date;
 	uint8_t *time;
-	u32 length;
+	uint32_t length;
 	uint8_t *data;
 } xilinx_bit_file_t;
 
-- 
cgit v1.2.3