aboutsummaryrefslogtreecommitdiff
path: root/src/jtag/zy1000/zy1000.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2016-05-22 04:34:04 +0200
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>2016-07-19 10:45:16 +0100
commitf19ac83152b54a204b8148815a538d868973e1e1 (patch)
tree381a04c00bd20dd508d6020f869ea3dd160de933 /src/jtag/zy1000/zy1000.c
parentf4496b25e3040e29b9bc78dd5bf8ac8128c09a1e (diff)
Fix usage of timeval_ms()
First, fix the timeval_ms() implementation to not have K&R but ANSI argument semantics by adding a missing void. timeval_ms() returns an int64_t, not uint64_t or long long. Consistently use int64_t for variables and PRI*64 as format string. While at it, change a few related variables to bool for clarity. Note that timeval_ms() may return a negative error code, but not a single caller checks for that. Change-Id: I27cf83e75b3e9a8913f6c43e98a281bea77aac13 Signed-off-by: Andreas Färber <afaerber@suse.de> Reviewed-on: http://openocd.zylin.com/3499 Tested-by: jenkins Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'src/jtag/zy1000/zy1000.c')
-rw-r--r--src/jtag/zy1000/zy1000.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 271a2817..67d99070 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -145,8 +145,8 @@ static int zy1000_power_dropout(int *dropout)
static void waitSRST(bool asserted)
{
bool first = true;
- long long start = 0;
- long total = 0;
+ int64_t start = 0;
+ int64_t total = 0;
const char *mode = asserted ? "assert" : "deassert";
for (;; ) {
@@ -167,7 +167,7 @@ static void waitSRST(bool asserted)
keep_alive();
if (total > 5000) {
- LOG_ERROR("SRST took too long to %s: %dms", mode, (int)total);
+ LOG_ERROR("SRST took too long to %s: %" PRId64 "ms", mode, total);
break;
}
}