diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-30 16:37:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-30 16:37:15 +0100 |
| commit | b471d5549188d01730131a322c4d154585ba1e60 (patch) | |
| tree | a591d8f004ac1a80c9dff7eab34dae81df6454b9 /hw/timer | |
| parent | 4a0ba67c77a425436e867fcbb8c513b44d7e7d6e (diff) | |
| parent | b9e3f1579a4b06fc63dfa8cdb68df1c58eeb0cf1 (diff) | |
| download | focaccia-qemu-b471d5549188d01730131a322c4d154585ba1e60.tar.gz focaccia-qemu-b471d5549188d01730131a322c4d154585ba1e60.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210330' into staging
* net/npcm7xx_emc.c: Fix handling of receiving packets when RSDR not set * hw/display/xlnx_dp: Free FIFOs adding xlnx_dp_finalize() * hw/arm/smmuv3: Drop unused CDM_VALID() and is_cd_valid() * target/arm: Make number of counters in PMCR follow the CPU * hw/timer/renesas_tmr: Add default-case asserts in read_tcnt() # gpg: Signature made Tue 30 Mar 2021 14:23:33 BST # gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE # gpg: issuer "peter.maydell@linaro.org" # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate] # gpg: aka "Peter Maydell <pmaydell@gmail.com>" [ultimate] # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate] # Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE * remotes/pmaydell/tags/pull-target-arm-20210330: hw/timer/renesas_tmr: Add default-case asserts in read_tcnt() target/arm: Make number of counters in PMCR follow the CPU hw/arm/smmuv3: Drop unused CDM_VALID() and is_cd_valid() hw/display/xlnx_dp: Free FIFOs adding xlnx_dp_finalize() net/npcm7xx_emc.c: Fix handling of receiving packets when RSDR not set Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer')
| -rw-r--r-- | hw/timer/renesas_tmr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c index eed39917fe..d96002e1ee 100644 --- a/hw/timer/renesas_tmr.c +++ b/hw/timer/renesas_tmr.c @@ -146,6 +146,8 @@ static uint16_t read_tcnt(RTMRState *tmr, unsigned size, int ch) case CSS_CASCADING: tcnt[1] = tmr->tcnt[1]; break; + default: + g_assert_not_reached(); } switch (FIELD_EX8(tmr->tccr[0], TCCR, CSS)) { case CSS_INTERNAL: @@ -159,6 +161,8 @@ static uint16_t read_tcnt(RTMRState *tmr, unsigned size, int ch) case CSS_EXTERNAL: /* QEMU doesn't implement this */ tcnt[0] = tmr->tcnt[0]; break; + default: + g_assert_not_reached(); } } else { tcnt[0] = tmr->tcnt[0]; |