From cd4c0598060dc6539604c9cad8cb645aa14b4ab1 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 13 Nov 2009 08:14:54 -0800
Subject: [PATCH] xilinx_bit_file_t -> struct xilinx_bit_file

Remove misleading typedef and redundant suffix from struct xilinx_bit_file.
---
 src/pld/virtex2.c    | 2 +-
 src/pld/xilinx_bit.c | 2 +-
 src/pld/xilinx_bit.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 4c1fc53d2..7a44065cf 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -134,7 +134,7 @@ static int virtex2_read_stat(struct pld_device_s *pld_device, uint32_t *status)
 static int virtex2_load(struct pld_device_s *pld_device, const char *filename)
 {
 	virtex2_pld_device_t *virtex2_info = pld_device->driver_priv;
-	xilinx_bit_file_t bit_file;
+	struct xilinx_bit_file bit_file;
 	int retval;
 	unsigned int i;
 	struct scan_field field;
diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 33c3ed79b..70edbf571 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -75,7 +75,7 @@ static int read_section(FILE *input_file, int length_size, char section,
 	return ERROR_OK;
 }
 
-int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, const char *filename)
+int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
 {
 	FILE *input_file;
 	struct stat input_stat;
diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h
index 3eb331baa..722d225cd 100644
--- a/src/pld/xilinx_bit.h
+++ b/src/pld/xilinx_bit.h
@@ -22,7 +22,7 @@
 
 #include "types.h"
 
-typedef struct xilinx_bit_file_s
+struct xilinx_bit_file
 {
 	uint8_t unknown_header[13];
 	uint8_t *source_file;
@@ -31,8 +31,8 @@ typedef struct xilinx_bit_file_s
 	uint8_t *time;
 	uint32_t length;
 	uint8_t *data;
-} xilinx_bit_file_t;
+};
 
-int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, const char *filename);
+int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename);
 
 #endif /* XILINX_BIT_H */