summaryrefslogtreecommitdiff
path: root/src/pld
diff options
context:
space:
mode:
Diffstat (limited to 'src/pld')
-rw-r--r--src/pld/pld.c8
-rw-r--r--src/pld/virtex2.c4
-rw-r--r--src/pld/xilinx_bit.c14
3 files changed, 13 insertions, 13 deletions
diff --git a/src/pld/pld.c b/src/pld/pld.c
index 6f08ee19..7325a209 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -95,7 +95,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
if (argc < 1)
{
- WARNING("incomplete 'pld bank' configuration");
+ LOG_WARNING("incomplete 'pld bank' configuration");
return ERROR_OK;
}
@@ -108,7 +108,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
/* register pld specific commands */
if (pld_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
{
- ERROR("couldn't register '%s' commands", args[0]);
+ LOG_ERROR("couldn't register '%s' commands", args[0]);
exit(-1);
}
@@ -118,7 +118,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
if (pld_drivers[i]->pld_device_command(cmd_ctx, cmd, args, argc, c) != ERROR_OK)
{
- ERROR("'%s' driver rejected pld device", args[0]);
+ LOG_ERROR("'%s' driver rejected pld device", args[0]);
free(c);
return ERROR_OK;
}
@@ -143,7 +143,7 @@ int handle_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char
/* no matching pld driver found */
if (!found)
{
- ERROR("pld driver '%s' not found", args[0]);
+ LOG_ERROR("pld driver '%s' not found", args[0]);
exit(-1);
}
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index 53acc598..45c39ae4 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -150,7 +150,7 @@ int virtex2_read_stat(struct pld_device_s *pld_device, u32 *status)
jtag_execute_queue();
- DEBUG("status: 0x%8.8x", *status);
+ LOG_DEBUG("status: 0x%8.8x", *status);
return ERROR_OK;
}
@@ -251,7 +251,7 @@ int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, cha
if (argc < 2)
{
- WARNING("incomplete pld device 'virtex2' configuration");
+ LOG_WARNING("incomplete pld device 'virtex2' configuration");
return ERROR_PLD_DEVICE_INVALID;
}
diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 3c99db0d..c8c825dd 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -46,7 +46,7 @@ int read_section(FILE *input_file, int length_size, char section, u32 *buffer_le
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;
}
@@ -94,30 +94,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;
}
@@ -136,7 +136,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);