xilinx_bit_file_t -> struct xilinx_bit_file

Remove misleading typedef and redundant suffix from struct xilinx_bit_file.

diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 4c1fc53d21e323bbe805aa3af86bc57ce430521b..7a44065cf911546929709216235f30655ff6195f 100644 (file)
--- 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 33c3ed79b7b24940c8dd4e85b74d1bee6d8fc6cd..70edbf571f55ec1d32006da13c91c77a01f8e921 100644 (file)
--- 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 3eb331baadf467b91aefda91794cdcdb1d17cc51..722d225cddc7854a304ea96476122166ed17016a 100644 (file)
--- 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 */