From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Magnus Damm" <magnus.damm@gmail.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>
Subject: [PULL 2/8] hw/timer/sh_timer: Coding style clean-up
Date: Tue, 27 Oct 2020 00:29:29 +0100 [thread overview]
Message-ID: <20201026232935.92777-3-f4bug@amsat.org> (raw)
In-Reply-To: <20201026232935.92777-1-f4bug@amsat.org>
From: Thomas Huth <thuth@redhat.com>
Replace TAB characters with spaces, put code after case-statement on
separate lines and add some curly braces in related lines to keep
checkpatch.pl happy.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201020153935.54315-2-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/timer/sh_timer.c | 89 +++++++++++++++++++++++++++++----------------
1 file changed, 57 insertions(+), 32 deletions(-)
diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index bb0e1c8ee53..b09e30f9388 100644
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -117,35 +117,55 @@ static void sh_timer_write(void *opaque, hwaddr offset,
case 2: freq >>= 6; break;
case 3: freq >>= 8; break;
case 4: freq >>= 10; break;
- case 6:
- case 7: if (s->feat & TIMER_FEAT_EXTCLK) break;
- default: hw_error("sh_timer_write: Reserved TPSC value\n"); break;
+ case 6:
+ case 7:
+ if (s->feat & TIMER_FEAT_EXTCLK) {
+ break;
+ }
+ default:
+ hw_error("sh_timer_write: Reserved TPSC value\n");
+ break;
}
switch ((value & TIMER_TCR_CKEG) >> 3) {
- case 0: break;
+ case 0:
+ break;
case 1:
case 2:
- case 3: if (s->feat & TIMER_FEAT_EXTCLK) break;
- default: hw_error("sh_timer_write: Reserved CKEG value\n"); break;
+ case 3:
+ if (s->feat & TIMER_FEAT_EXTCLK) {
+ break;
+ }
+ default:
+ hw_error("sh_timer_write: Reserved CKEG value\n");
+ break;
}
switch ((value & TIMER_TCR_ICPE) >> 6) {
- case 0: break;
+ case 0:
+ break;
case 2:
- case 3: if (s->feat & TIMER_FEAT_CAPT) break;
- default: hw_error("sh_timer_write: Reserved ICPE value\n"); break;
+ case 3:
+ if (s->feat & TIMER_FEAT_CAPT) {
+ break;
+ }
+ default:
+ hw_error("sh_timer_write: Reserved ICPE value\n");
+ break;
}
- if ((value & TIMER_TCR_UNF) == 0)
+ if ((value & TIMER_TCR_UNF) == 0) {
s->int_level = 0;
+ }
- value &= ~TIMER_TCR_UNF;
+ value &= ~TIMER_TCR_UNF;
- if ((value & TIMER_TCR_ICPF) && (!(s->feat & TIMER_FEAT_CAPT)))
+ if ((value & TIMER_TCR_ICPF) && (!(s->feat & TIMER_FEAT_CAPT))) {
hw_error("sh_timer_write: Reserved ICPF value\n");
+ }
- value &= ~TIMER_TCR_ICPF; /* capture not supported */
+ value &= ~TIMER_TCR_ICPF; /* capture not supported */
- if (value & TIMER_TCR_RESERVED)
+ if (value & TIMER_TCR_RESERVED) {
hw_error("sh_timer_write: Reserved TCR bits set\n");
+ }
s->tcr = value;
ptimer_set_limit(s->timer, s->tcor, 0);
ptimer_set_freq(s->timer, freq);
@@ -158,8 +178,8 @@ static void sh_timer_write(void *opaque, hwaddr offset,
case OFFSET_TCPR:
if (s->feat & TIMER_FEAT_CAPT) {
s->tcpr = value;
- break;
- }
+ break;
+ }
default:
hw_error("sh_timer_write: Bad offset %x\n", (int)offset);
}
@@ -241,8 +261,9 @@ static uint64_t tmu012_read(void *opaque, hwaddr offset,
#endif
if (offset >= 0x20) {
- if (!(s->feat & TMU012_FEAT_3CHAN))
- hw_error("tmu012_write: Bad channel offset %x\n", (int)offset);
+ if (!(s->feat & TMU012_FEAT_3CHAN)) {
+ hw_error("tmu012_write: Bad channel offset %x\n", (int)offset);
+ }
return sh_timer_read(s->timer[2], offset - 0x20);
}
@@ -272,33 +293,36 @@ static void tmu012_write(void *opaque, hwaddr offset,
#endif
if (offset >= 0x20) {
- if (!(s->feat & TMU012_FEAT_3CHAN))
- hw_error("tmu012_write: Bad channel offset %x\n", (int)offset);
+ if (!(s->feat & TMU012_FEAT_3CHAN)) {
+ hw_error("tmu012_write: Bad channel offset %x\n", (int)offset);
+ }
sh_timer_write(s->timer[2], offset - 0x20, value);
- return;
+ return;
}
if (offset >= 0x14) {
sh_timer_write(s->timer[1], offset - 0x14, value);
- return;
+ return;
}
if (offset >= 0x08) {
sh_timer_write(s->timer[0], offset - 0x08, value);
- return;
+ return;
}
if (offset == 4) {
sh_timer_start_stop(s->timer[0], value & (1 << 0));
sh_timer_start_stop(s->timer[1], value & (1 << 1));
- if (s->feat & TMU012_FEAT_3CHAN)
+ if (s->feat & TMU012_FEAT_3CHAN) {
sh_timer_start_stop(s->timer[2], value & (1 << 2));
- else
- if (value & (1 << 2))
+ } else {
+ if (value & (1 << 2)) {
hw_error("tmu012_write: Bad channel\n");
+ }
+ }
- s->tstr = value;
- return;
+ s->tstr = value;
+ return;
}
if ((s->feat & TMU012_FEAT_TOCR) && offset == 0) {
@@ -314,8 +338,8 @@ static const MemoryRegionOps tmu012_ops = {
void tmu012_init(MemoryRegion *sysmem, hwaddr base,
int feat, uint32_t freq,
- qemu_irq ch0_irq, qemu_irq ch1_irq,
- qemu_irq ch2_irq0, qemu_irq ch2_irq1)
+ qemu_irq ch0_irq, qemu_irq ch1_irq,
+ qemu_irq ch2_irq0, qemu_irq ch2_irq1)
{
tmu012_state *s;
int timer_feat = (feat & TMU012_FEAT_EXTCLK) ? TIMER_FEAT_EXTCLK : 0;
@@ -324,9 +348,10 @@ void tmu012_init(MemoryRegion *sysmem, hwaddr base,
s->feat = feat;
s->timer[0] = sh_timer_init(freq, timer_feat, ch0_irq);
s->timer[1] = sh_timer_init(freq, timer_feat, ch1_irq);
- if (feat & TMU012_FEAT_3CHAN)
+ if (feat & TMU012_FEAT_3CHAN) {
s->timer[2] = sh_timer_init(freq, timer_feat | TIMER_FEAT_CAPT,
- ch2_irq0); /* ch2_irq1 not supported */
+ ch2_irq0); /* ch2_irq1 not supported */
+ }
memory_region_init_io(&s->iomem, NULL, &tmu012_ops, s,
"timer", 0x100000000ULL);
--
2.26.2
next prev parent reply other threads:[~2020-10-26 23:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 23:29 [PULL 0/8] Renesas patches for 2020-10-27 Philippe Mathieu-Daudé
2020-10-26 23:29 ` [PULL 1/8] elf: Add EM_RX definition Philippe Mathieu-Daudé
2020-10-26 23:29 ` Philippe Mathieu-Daudé [this message]
2020-10-26 23:29 ` [PULL 3/8] hw/timer/sh_timer: Silence warnings about missing fallthrough statements Philippe Mathieu-Daudé
2020-10-26 23:29 ` [PULL 4/8] hw/timer/sh_timer: Remove superfluous "break" statements Philippe Mathieu-Daudé
2020-10-26 23:29 ` [PULL 5/8] target/sh4: Update coding style to make checkpatch.pl happy Philippe Mathieu-Daudé
2020-10-26 23:29 ` [PULL 6/8] target/sh4: fix some comment spelling errors Philippe Mathieu-Daudé
2020-10-26 23:29 ` [PULL 7/8] target/rx: Fix " Philippe Mathieu-Daudé
2020-10-26 23:29 ` [PULL 8/8] target/rx: Fix Lesser GPL version number Philippe Mathieu-Daudé
2020-10-28 19:59 ` [PULL 0/8] Renesas patches for 2020-10-27 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201026232935.92777-3-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=magnus.damm@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.