diff options
| author | Jason Chien <jason.chien@sifive.com> | 2023-07-28 08:24:39 +0000 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-09-20 10:18:14 +0300 |
| commit | c00a9ec0613ca428abaedaf8b7be7b1cbb97d37f (patch) | |
| tree | 0bdfb0d7ff49b92269271d717b7ecf879cefa52a | |
| parent | fd1a0c89c66c9e03b6cc7a1283856bb2112a9bde (diff) | |
| download | qemu-c00a9ec0613ca428abaedaf8b7be7b1cbb97d37f.zip qemu-c00a9ec0613ca428abaedaf8b7be7b1cbb97d37f.tar.gz qemu-c00a9ec0613ca428abaedaf8b7be7b1cbb97d37f.tar.bz2 | |
hw/intc: Make rtc variable names consistent
The variables whose values are given by cpu_riscv_read_rtc() should be named
"rtc". The variables whose value are given by cpu_riscv_read_rtc_raw()
should be named "rtc_r".
Signed-off-by: Jason Chien <jason.chien@sifive.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230728082502.26439-2-jason.chien@sifive.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
(cherry picked from commit 9382a9eafccad8dc6a487ea3a8d2bed03dc35db9)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | hw/intc/riscv_aclint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index bf77e29..25cf7a5 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -64,13 +64,13 @@ static void riscv_aclint_mtimer_write_timecmp(RISCVAclintMTimerState *mtimer, uint64_t next; uint64_t diff; - uint64_t rtc_r = cpu_riscv_read_rtc(mtimer); + uint64_t rtc = cpu_riscv_read_rtc(mtimer); /* Compute the relative hartid w.r.t the socket */ hartid = hartid - mtimer->hartid_base; mtimer->timecmp[hartid] = value; - if (mtimer->timecmp[hartid] <= rtc_r) { + if (mtimer->timecmp[hartid] <= rtc) { /* * If we're setting an MTIMECMP value in the "past", * immediately raise the timer interrupt @@ -81,7 +81,7 @@ static void riscv_aclint_mtimer_write_timecmp(RISCVAclintMTimerState *mtimer, /* otherwise, set up the future timer interrupt */ qemu_irq_lower(mtimer->timer_irqs[hartid]); - diff = mtimer->timecmp[hartid] - rtc_r; + diff = mtimer->timecmp[hartid] - rtc; /* back to ns (note args switched in muldiv64) */ uint64_t ns_diff = muldiv64(diff, NANOSECONDS_PER_SECOND, timebase_freq); |