OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/ppc/ppc4xx_devs: Make code style fixes to UIC code 

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>
Message-Id: <20201212001537.24520-2-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Peter Maydell 2020-12-12 00:15:30 +00:00 committed by David Gibson
parent 52d2546460
commit 59a958bb74
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/ppc/ppc4xx_devs.c
View File

@ -105,7 +105,7 @@ struct ppcuic_t {
qemu_irq *irqs; qemu_irq *irqs;
}; };
static void ppcuic_trigger_irq (ppcuic_t *uic) static void ppcuic_trigger_irq(ppcuic_t *uic)
{ {
uint32_t ir, cr; uint32_t ir, cr;
int start, end, inc, i; 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; ppcuic_t *uic;
uint32_t mask, sr; uint32_t mask, sr;
uic = opaque; uic = opaque;
mask = 1U << (31-irq_num); mask = 1U << (31 - irq_num);
LOG_UIC("%s: irq %d level %d uicsr %08" PRIx32 LOG_UIC("%s: irq %d level %d uicsr %08" PRIx32
" mask %08" PRIx32 " => %08" PRIx32 " %08" PRIx32 "\n", " mask %08" PRIx32 " => %08" PRIx32 " %08" PRIx32 "\n",
__func__, irq_num, level, __func__, irq_num, level,
uic->uicsr, mask, uic->uicsr & mask, level << irq_num); uic->uicsr, mask, uic->uicsr & mask, level << irq_num);
if (irq_num < 0 || irq_num > 31) if (irq_num < 0 || irq_num > 31) {
return; return;
}
sr = uic->uicsr; sr = uic->uicsr;
/* Update status register */ /* Update status register */
if (uic->uictr & mask) { if (uic->uictr & mask) {
/* Edge sensitive interrupt */ /* Edge sensitive interrupt */
if (level == 1) if (level == 1) {
uic->uicsr |= mask; uic->uicsr |= mask;
}
} else { } else {
/* Level sensitive interrupt */ /* Level sensitive interrupt */
if (level == 1) { 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 " => " LOG_UIC("%s: irq %d level %d sr %" PRIx32 " => "
"%08" PRIx32 "\n", __func__, irq_num, level, uic->uicsr, sr); "%08" PRIx32 "\n", __func__, irq_num, level, uic->uicsr, sr);
if (sr != uic->uicsr) if (sr != uic->uicsr) {
ppcuic_trigger_irq(uic); 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; ppcuic_t *uic;
uint32_t ret; uint32_t ret;
@ -220,13 +223,15 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
ret = uic->uicsr & uic->uicer; ret = uic->uicsr & uic->uicer;
break; break;
case DCR_UICVR: case DCR_UICVR:
if (!uic->use_vectors) if (!uic->use_vectors) {
goto no_read; goto no_read;
}
ret = uic->uicvr; ret = uic->uicvr;
break; break;
case DCR_UICVCR: case DCR_UICVCR:
if (!uic->use_vectors) if (!uic->use_vectors) {
goto no_read; goto no_read;
}
ret = uic->uicvcr; ret = uic->uicvcr;
break; break;
default: default:
@ -238,7 +243,7 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
return ret; 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; ppcuic_t *uic;