__FILE__ and __LINE__ are already printed using the log macros.
Signed-off-by: Andreas Fritiofson <[email protected]>
---
src/jtag/drivers/rlink.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c
index 46882a5..c501b56 100644
--- a/src/jtag/drivers/rlink.c
+++ b/src/jtag/drivers/rlink.c
@@ -504,7 +504,7 @@ dtc_run_download(
int usb_err;
int i;
- LOG_DEBUG(": %d/%d", command_buffer_size, reply_buffer_size);
+ LOG_DEBUG("%d/%d", command_buffer_size, reply_buffer_size);
usb_err = usb_bulk_write(
pHDev_param,
@@ -538,9 +538,7 @@ dtc_run_download(
if (dtc_status & 0x01) break;
if (!--i) {
- LOG_ERROR("%s, %d: too many retries waiting for DTC
status",
- __FILE__, __LINE__
- );
+ LOG_ERROR("too many retries waiting for DTC status");
return(-ETIMEDOUT);
}
}
@@ -555,8 +553,8 @@ dtc_run_download(
);
if (usb_err < reply_buffer_size) {
- LOG_ERROR("%s, %d: Read of endpoint 2 returned %d,
expected %d",
- __FILE__, __LINE__, usb_err,
reply_buffer_size
+ LOG_ERROR("Read of endpoint 2 returned %d, expected %d",
+ usb_err, reply_buffer_size
);
return(usb_err);
}
@@ -1493,10 +1491,7 @@ int rlink_speed(int speed)
}
if (dtc_start_download() < 0) {
- LOG_ERROR("%s, %d: starting DTC: %s",
- __FILE__, __LINE__,
- usb_strerror()
- );
+ LOG_ERROR("starting DTC: %s", usb_strerror());
exit(1);
}
--
1.7.4.1
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development