X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fpld%2Fxilinx_bit.c;h=ef3c1e65df9062768ba3d186f0da7fbcf32bb6bc;hp=7bf72b2ee9f99444b6b63e879f7f6b6807f14839;hb=00228aa8398fd7dde1271af424fab1cb470c5f43;hpb=e9297b40b994f071474210e7d9e224d50e25fcaf

diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 7bf72b2ee9..ef3c1e65df 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -22,31 +22,22 @@
 #endif
 
 #include "xilinx_bit.h"
-
 #include "pld.h"
 #include "log.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
 
-#include <sys/time.h>
-#include <time.h>
 
 int read_section(FILE *input_file, int length_size, char section, u32 *buffer_length, u8 **buffer) 
 {
 	u8 length_buffer[4];
-	u32 length;
+	int length;
 	char section_char;
 	int read_count;
 	
 	if ((length_size != 2) && (length_size != 4))
 	{
-		ERROR("BUG: length_size neither 2 nor 4");
+		LOG_ERROR("BUG: length_size neither 2 nor 4");
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 
@@ -67,8 +58,7 @@ int read_section(FILE *input_file, int length_size, char section, u32 *buffer_le
 	
 	if (length_size == 4)
 		length = be_to_h_u32(length_buffer);
-
-	if (length_size == 2)
+	else /* (length_size == 2) */
 		length = be_to_h_u16(length_buffer);
 		
 	if (buffer_length)
@@ -95,30 +85,30 @@ int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename)
 	
 	if (stat(filename, &input_stat) == -1)
 	{
-		ERROR("couldn't stat() %s: %s", filename, strerror(errno));
+		LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 
 	if (S_ISDIR(input_stat.st_mode))
 	{
-		ERROR("%s is a directory", filename);
+		LOG_ERROR("%s is a directory", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 		
 	if (input_stat.st_size == 0){
-		ERROR("Empty file %s", filename);
+		LOG_ERROR("Empty file %s", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 		
 	if (!(input_file = fopen(filename, "rb")))
 	{
-		ERROR("couldn't open %s: %s", filename, strerror(errno));
+		LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 	
 	if ((read_count = fread(bit_file->unknown_header, 1, 13, input_file)) != 13)
 	{
-		ERROR("couldn't read unknown_header from file '%s'", filename);
+		LOG_ERROR("couldn't read unknown_header from file '%s'", filename);
 		return ERROR_PLD_FILE_LOAD_FAILED;
 	}
 	
@@ -137,7 +127,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;
 	
-	DEBUG("bit_file: %s %s %s,%s %i", bit_file->source_file, bit_file->part_name,
+	LOG_DEBUG("bit_file: %s %s %s,%s %i", bit_file->source_file, bit_file->part_name,
 		bit_file->date, bit_file->time, bit_file->length);
 	
 	fclose(input_file);