change #include "log.h" to <helper/log.h>

[openocd.git] / src / pld / xilinx_bit.c

diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index e647a9c5b1e546cc88fe923fafe004b8e62add52..1ae1ea8df689ae7277d46510e1e083c0c8e9a648 100644 (file)
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -23,15 +23,15 @@
 
 #include "xilinx_bit.h"
 #include "pld.h"
-#include "log.h"
+#include <helper/log.h>
 
 #include <sys/stat.h>
 
 
 static int read_section(FILE *input_file, int length_size, char section,
-               u32 *buffer_length, u8 **buffer)
+               uint32_t *buffer_length, uint8_t **buffer)
 {
-       u8 length_buffer[4];
+       uint8_t length_buffer[4];
        int length;
        char section_char;
        int read_count;
@@ -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, char *filename)
+int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
 {
        FILE *input_file;
        struct stat input_stat;
@@ -96,7 +96,7 @@ int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename)
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
 
-       if (input_stat.st_size == 0){
+       if (input_stat.st_size == 0) {
                LOG_ERROR("Empty file %s", filename);
                return ERROR_PLD_FILE_LOAD_FAILED;
        }
@@ -128,7 +128,7 @@ int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename)
        if (read_section(input_file, 4, 'e', &bit_file->length, &bit_file->data) != ERROR_OK)
                return ERROR_PLD_FILE_LOAD_FAILED;
 
-       LOG_DEBUG("bit_file: %s %s %s,%s %i", bit_file->source_file, bit_file->part_name,
+       LOG_DEBUG("bit_file: %s %s %s,%s %" PRIi32 "", bit_file->source_file, bit_file->part_name,
                bit_file->date, bit_file->time, bit_file->length);
 
        fclose(input_file);