From nobody Mon Nov 17 12:06:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.54 as permitted sender) client-ip=209.85.208.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603754990; cv=none; d=zohomail.com; s=zohoarc; b=FD+7DwrK+UcvmjrYlKp/qfG90MUh++/t81SxZMLoMYwsy99DQ+IU5gEQ/taN+4e1ab6h4WalqCdUtC75WB7fXpjPBbHrGgkNq+xVa/Lj119T0TRr3BVNXAMw8LLoBC4lCElPrEO8PDmtv0frDV65nx4bDnf6GE9aJlwnCyYZsIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603754990; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2kYJylSUVap5cHs18MspyX6fw/+yTmDa3KK/zRKs/IU=; b=Ih8pX0xH7zwXNDPemOlB+eJEF0cq6qz64Z1XsTdKSrKXizyzBi2eUx60vDRoPzZMhms1Ll6f2AQnD3OnS3Eop5Lbm17tJVqj+OYlQD2Xm1ZktqHU96rxxp0OcxIb4T25/sD4qUvoRH0NzhwndO9Gc3zU6sdZtiS4SXHVQyq2+r8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by mx.zohomail.com with SMTPS id 1603754990661558.2319591148348; Mon, 26 Oct 2020 16:29:50 -0700 (PDT) Received: by mail-ed1-f54.google.com with SMTP id o18so11551962edq.4 for ; Mon, 26 Oct 2020 16:29:50 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id ck19sm6596062ejb.99.2020.10.26.16.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 16:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2kYJylSUVap5cHs18MspyX6fw/+yTmDa3KK/zRKs/IU=; b=I/UxKwqjsp0MGWHZl4jbkzpoKAd0QGPrQ9/bMFCKa7ieiSocyeOO4aMnkEJfAWUeHV 5rKyNz9mrOBpkVnZSGEiPPBSYuLGh/mny4MyoON9boj64sZJLLUYSi1HWqLuBYHFqRkk spzXqU4TdFKIMOlDmbsZNIEvBfoS4O4X/19RLfrK+UXITNpFWe5Ox/kl3ZhEdsFgyCT/ 1hjdRlwylUj2wvnVEs8VInKVPE+qgeAYxkKBK0gx2U+W0yU0lfuWfNNB8o8JjLfH9Sp/ PGovMBtdiuZeTicJL5HsEsTmLz5GeLg+VAlKBgzW1QQJD5FCJ5+3EASWMFX0a7RyMT9V J+Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2kYJylSUVap5cHs18MspyX6fw/+yTmDa3KK/zRKs/IU=; b=Ns+IbuRgOOOPuHktgK5Xcr9TwS6vedDrgSMsfuV4NiaymefxBHlmFSLehBRm2muvPy WLoItMa0Nx+Pi/+SxHXpoNqIVYOfMrWmSfl+M7rUtDNINqLF3HvC8CuClHGm73/0dN8y 2PMRpERLMIqBS1g353ITGKuC+ij+UnygRB5D2mHMIjNCK5rGdJdmLoT59VJnjnz6ZkNw ptxtzJA7rYnmt9HjgulJnlB8JM2vNqPkd5i15YBYqd9KAIHogzghCHf0EbpVmJcizaiZ J8ZOksCNZFEAJTg0hj90xFNM24CkAspgWvmXAf+/xYWvkb+qEBglKjii+YfYLluYt0Pv mHNA== X-Gm-Message-State: AOAM5302Qg4g8VGL/XpYG8xvjOmqEYxigsRKc7oF9DErgbfSsdyL4Lbs E73h+W26O6pyHHamAioVSxY= X-Google-Smtp-Source: ABdhPJzli51YBxDrqx15oaQecjYaYeSkNVUgAQQsq5dCTGuDIYGa+JnK4pg046VKatbeFCb6W0eWDA== X-Received: by 2002:a50:e705:: with SMTP id a5mr13373894edn.29.1603754988641; Mon, 26 Oct 2020 16:29:48 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yoshinori Sato , Magnus Damm , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 2/8] hw/timer/sh_timer: Coding style clean-up Date: Tue, 27 Oct 2020 00:29:29 +0100 Message-Id: <20201026232935.92777-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201026232935.92777-1-f4bug@amsat.org> References: <20201026232935.92777-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Thomas Huth 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20201020153935.54315-2-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 offse= t, case 2: freq >>=3D 6; break; case 3: freq >>=3D 8; break; case 4: freq >>=3D 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) =3D=3D 0) + if ((value & TIMER_TCR_UNF) =3D=3D 0) { s->int_level =3D 0; + } =20 - value &=3D ~TIMER_TCR_UNF; + value &=3D ~TIMER_TCR_UNF; =20 - 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"); + } =20 - value &=3D ~TIMER_TCR_ICPF; /* capture not supported */ + value &=3D ~TIMER_TCR_ICPF; /* capture not supported */ =20 - if (value & TIMER_TCR_RESERVED) + if (value & TIMER_TCR_RESERVED) { hw_error("sh_timer_write: Reserved TCR bits set\n"); + } s->tcr =3D 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 =3D 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 =20 if (offset >=3D 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); } =20 @@ -272,33 +293,36 @@ static void tmu012_write(void *opaque, hwaddr offset, #endif =20 if (offset >=3D 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; } =20 if (offset >=3D 0x14) { sh_timer_write(s->timer[1], offset - 0x14, value); - return; + return; } =20 if (offset >=3D 0x08) { sh_timer_write(s->timer[0], offset - 0x08, value); - return; + return; } =20 if (offset =3D=3D 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"); + } + } =20 - s->tstr =3D value; - return; + s->tstr =3D value; + return; } =20 if ((s->feat & TMU012_FEAT_TOCR) && offset =3D=3D 0) { @@ -314,8 +338,8 @@ static const MemoryRegionOps tmu012_ops =3D { =20 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 =3D (feat & TMU012_FEAT_EXTCLK) ? TIMER_FEAT_EXTCLK : 0; @@ -324,9 +348,10 @@ void tmu012_init(MemoryRegion *sysmem, hwaddr base, s->feat =3D feat; s->timer[0] =3D sh_timer_init(freq, timer_feat, ch0_irq); s->timer[1] =3D sh_timer_init(freq, timer_feat, ch1_irq); - if (feat & TMU012_FEAT_3CHAN) + if (feat & TMU012_FEAT_3CHAN) { s->timer[2] =3D sh_timer_init(freq, timer_feat | TIMER_FEAT_CAPT, - ch2_irq0); /* ch2_irq1 not supported */ + ch2_irq0); /* ch2_irq1 not supported */ + } =20 memory_region_init_io(&s->iomem, NULL, &tmu012_ops, s, "timer", 0x100000000ULL); --=20 2.26.2