diff options
| author | Andreas Färber <afaerber@suse.de> | 2016-05-22 04:34:04 +0200 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2016-07-19 10:45:16 +0100 |
| commit | f19ac83152b54a204b8148815a538d868973e1e1 (patch) | |
| tree | 381a04c00bd20dd508d6020f869ea3dd160de933 /src/flash/nor/stmsmi.c | |
| parent | f4496b25e3040e29b9bc78dd5bf8ac8128c09a1e (diff) | |
| download | riscv-openocd-f19ac83152b54a204b8148815a538d868973e1e1.zip riscv-openocd-f19ac83152b54a204b8148815a538d868973e1e1.tar.gz riscv-openocd-f19ac83152b54a204b8148815a538d868973e1e1.tar.bz2 | |
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/flash/nor/stmsmi.c')
| -rw-r--r-- | src/flash/nor/stmsmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flash/nor/stmsmi.c b/src/flash/nor/stmsmi.c index e4d59fe..781ea3b 100644 --- a/src/flash/nor/stmsmi.c +++ b/src/flash/nor/stmsmi.c @@ -160,7 +160,7 @@ FLASH_BANK_COMMAND_HANDLER(stmsmi_flash_bank_command) /* timeout in ms */ static int poll_tff(struct target *target, uint32_t io_base, int timeout) { - long long endtime; + int64_t endtime; if (SMI_READ_REG(SMI_SR) & SMI_TFF) return ERROR_OK; @@ -211,7 +211,7 @@ static int wait_till_ready(struct flash_bank *bank, int timeout) { uint32_t status; int retval; - long long endtime; + int64_t endtime; endtime = timeval_ms() + timeout; do { |