From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
qemu-ppc@nongnu.org, David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code
Date: Sat, 12 Dec 2020 00:15:30 +0000 [thread overview]
Message-ID: <20201212001537.24520-2-peter.maydell@linaro.org> (raw)
In-Reply-To: <20201212001537.24520-1-peter.maydell@linaro.org>
In a following commit we will move the PPC UIC implementation to
its own file in hw/intc. To prevent checkpatch complaining about that
code-motion, fix up the minor style issues first.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/ppc/ppc4xx_devs.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index f1651e04d9a..f2f9ca4ffec 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -105,7 +105,7 @@ struct ppcuic_t {
qemu_irq *irqs;
};
-static void ppcuic_trigger_irq (ppcuic_t *uic)
+static void ppcuic_trigger_irq(ppcuic_t *uic)
{
uint32_t ir, cr;
int start, end, inc, i;
@@ -156,26 +156,28 @@ static void ppcuic_trigger_irq (ppcuic_t *uic)
}
}
-static void ppcuic_set_irq (void *opaque, int irq_num, int level)
+static void ppcuic_set_irq(void *opaque, int irq_num, int level)
{
ppcuic_t *uic;
uint32_t mask, sr;
uic = opaque;
- mask = 1U << (31-irq_num);
+ mask = 1U << (31 - irq_num);
LOG_UIC("%s: irq %d level %d uicsr %08" PRIx32
" mask %08" PRIx32 " => %08" PRIx32 " %08" PRIx32 "\n",
__func__, irq_num, level,
uic->uicsr, mask, uic->uicsr & mask, level << irq_num);
- if (irq_num < 0 || irq_num > 31)
+ if (irq_num < 0 || irq_num > 31) {
return;
+ }
sr = uic->uicsr;
/* Update status register */
if (uic->uictr & mask) {
/* Edge sensitive interrupt */
- if (level == 1)
+ if (level == 1) {
uic->uicsr |= mask;
+ }
} else {
/* Level sensitive interrupt */
if (level == 1) {
@@ -188,11 +190,12 @@ static void ppcuic_set_irq (void *opaque, int irq_num, int level)
}
LOG_UIC("%s: irq %d level %d sr %" PRIx32 " => "
"%08" PRIx32 "\n", __func__, irq_num, level, uic->uicsr, sr);
- if (sr != uic->uicsr)
+ if (sr != uic->uicsr) {
ppcuic_trigger_irq(uic);
+ }
}
-static uint32_t dcr_read_uic (void *opaque, int dcrn)
+static uint32_t dcr_read_uic(void *opaque, int dcrn)
{
ppcuic_t *uic;
uint32_t ret;
@@ -220,13 +223,15 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
ret = uic->uicsr & uic->uicer;
break;
case DCR_UICVR:
- if (!uic->use_vectors)
+ if (!uic->use_vectors) {
goto no_read;
+ }
ret = uic->uicvr;
break;
case DCR_UICVCR:
- if (!uic->use_vectors)
+ if (!uic->use_vectors) {
goto no_read;
+ }
ret = uic->uicvcr;
break;
default:
@@ -238,7 +243,7 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
return ret;
}
-static void dcr_write_uic (void *opaque, int dcrn, uint32_t val)
+static void dcr_write_uic(void *opaque, int dcrn, uint32_t val)
{
ppcuic_t *uic;
--
2.20.1
next prev parent reply other threads:[~2020-12-12 1:13 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-12 0:15 [PATCH 0/8] hw/ppc: Convert UIC device to QOM Peter Maydell
2020-12-12 0:15 ` Peter Maydell [this message]
2020-12-13 12:09 ` [PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code Philippe Mathieu-Daudé
2020-12-13 14:33 ` Edgar E. Iglesias
2020-12-14 5:43 ` David Gibson
2020-12-14 9:15 ` Thomas Huth
2020-12-12 0:15 ` [PATCH 2/8] ppc: Convert PPC UIC to a QOM device Peter Maydell
2020-12-12 16:57 ` BALATON Zoltan via
2020-12-12 18:27 ` BALATON Zoltan via
2020-12-12 18:33 ` Peter Maydell
2020-12-12 19:53 ` BALATON Zoltan via
2020-12-13 14:34 ` Edgar E. Iglesias
2020-12-14 5:54 ` David Gibson
2020-12-14 9:12 ` BALATON Zoltan via
2020-12-12 0:15 ` [PATCH 3/8] hw/ppc/virtex_ml507: Drop use of ppcuic_init() Peter Maydell
2020-12-13 14:32 ` Edgar E. Iglesias
2020-12-14 5:55 ` David Gibson
2021-01-11 19:04 ` BALATON Zoltan
2020-12-12 0:15 ` [PATCH 4/8] hw/ppc/ppc440_bamboo: " Peter Maydell
2020-12-14 5:56 ` David Gibson
2021-01-11 1:00 ` Nathan Chancellor
2021-01-11 17:14 ` Peter Maydell
2021-01-11 18:22 ` Mark Cave-Ayland
2021-02-03 16:35 ` Philippe Mathieu-Daudé
2020-12-12 0:15 ` [PATCH 5/8] hw/ppc/sam460ex: " Peter Maydell
2020-12-12 17:17 ` BALATON Zoltan via
2020-12-12 18:11 ` Peter Maydell
2020-12-12 20:35 ` BALATON Zoltan via
2020-12-12 19:53 ` BALATON Zoltan via
2020-12-12 19:55 ` Peter Maydell
2020-12-12 0:15 ` [PATCH 6/8] hw/ppc: Delete unused ppc405cr_init() code Peter Maydell
2020-12-12 0:15 ` [PATCH 7/8] hw/ppc/ppc405_uc: Drop use of ppcuic_init() Peter Maydell
2021-01-11 19:09 ` BALATON Zoltan
2020-12-12 0:15 ` [PATCH 8/8] hw/ppc: Remove unused ppcuic_init() Peter Maydell
2020-12-13 14:35 ` Edgar E. Iglesias
2020-12-12 17:43 ` [PATCH 0/8] hw/ppc: Convert UIC device to QOM BALATON Zoltan via
2020-12-12 18:13 ` Peter Maydell
2020-12-14 6:00 ` David Gibson
2020-12-14 10:04 ` 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=20201212001537.24520-2-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=david@gibson.dropbear.id.au \
--cc=edgar.iglesias@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).