ARMV7M: handle bkpt instruction on resume/step

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

diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 73d6123762644802bf5e9bc8c75a5c143d5ca2c8..1ae1ea8df689ae7277d46510e1e083c0c8e9a648 100644 (file)
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -23,7 +23,7 @@
 
 #include "xilinx_bit.h"
 #include "pld.h"
-#include "log.h"
+#include <helper/log.h>
 
 #include <sys/stat.h>
 
@@ -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;
        }