[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 21/23] i8259: Fix coding style
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 21/23] i8259: Fix coding style |
Date: |
Fri, 7 Oct 2011 09:19:54 +0200 |
No functional changes.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/i8259.c | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/hw/i8259.c b/hw/i8259.c
index b4e1867..ab519de 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -67,7 +67,7 @@ struct PicState {
MemoryRegion elcr_io;
};
-#if defined(DEBUG_PIC) || defined (DEBUG_IRQ_COUNT)
+#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT)
static int irq_level[16];
#endif
#ifdef DEBUG_IRQ_COUNT
@@ -84,11 +84,14 @@ static PicState *slave_pic;
static int get_priority(PicState *s, int mask)
{
int priority;
- if (mask == 0)
+
+ if (mask == 0) {
return 8;
+ }
priority = 0;
- while ((mask & (1 << ((priority + s->priority_add) & 7))) == 0)
+ while ((mask & (1 << ((priority + s->priority_add) & 7))) == 0) {
priority++;
+ }
return priority;
}
@@ -99,14 +102,16 @@ static int pic_get_irq(PicState *s)
mask = s->irr & ~s->imr;
priority = get_priority(s, mask);
- if (priority == 8)
+ if (priority == 8) {
return -1;
+ }
/* compute current priority. If special fully nested mode on the
master, the IRQ coming from the slave is not taken into account
for the priority computation. */
mask = s->isr;
- if (s->special_mask)
+ if (s->special_mask) {
mask &= ~s->imr;
+ }
if (s->special_fully_nested_mode && s->master) {
mask &= ~(1 << 2);
}
@@ -188,14 +193,16 @@ static void pic_set_irq(void *opaque, int irq, int level)
static void pic_intack(PicState *s, int irq)
{
if (s->auto_eoi) {
- if (s->rotate_on_auto_eoi)
+ if (s->rotate_on_auto_eoi) {
s->priority_add = (irq + 1) & 7;
+ }
} else {
s->isr |= (1 << irq);
}
/* We don't clear a level sensitive interrupt here */
- if (!(s->elcr & (1 << irq)))
+ if (!(s->elcr & (1 << irq))) {
s->irr &= ~(1 << irq);
+ }
pic_update_irq(s);
}
@@ -283,18 +290,22 @@ static void pic_ioport_write(void *opaque,
target_phys_addr_t addr64,
s->init_state = 1;
s->init4 = val & 1;
s->single_mode = val & 2;
- if (val & 0x08)
+ if (val & 0x08) {
hw_error("level sensitive irq not supported");
+ }
} else if (val & 0x08) {
- if (val & 0x04)
+ if (val & 0x04) {
s->poll = 1;
- if (val & 0x02)
+ }
+ if (val & 0x02) {
s->read_reg_select = val & 1;
- if (val & 0x40)
+ }
+ if (val & 0x40) {
s->special_mask = (val >> 5) & 1;
+ }
} else {
cmd = val >> 5;
- switch(cmd) {
+ switch (cmd) {
case 0:
case 4:
s->rotate_on_auto_eoi = cmd >> 2;
@@ -305,8 +316,9 @@ static void pic_ioport_write(void *opaque,
target_phys_addr_t addr64,
if (priority != 8) {
irq = (priority + s->priority_add) & 7;
s->isr &= ~(1 << irq);
- if (cmd == 5)
+ if (cmd == 5) {
s->priority_add = (irq + 1) & 7;
+ }
pic_update_irq(s);
}
break;
@@ -331,7 +343,7 @@ static void pic_ioport_write(void *opaque,
target_phys_addr_t addr64,
}
}
} else {
- switch(s->init_state) {
+ switch (s->init_state) {
case 0:
/* normal mode */
s->imr = val;
@@ -374,10 +386,11 @@ static uint64_t pic_ioport_read(void *opaque,
target_phys_addr_t addr,
s->poll = 0;
} else {
if (addr == 0) {
- if (s->read_reg_select)
+ if (s->read_reg_select) {
ret = s->isr;
- else
+ } else {
ret = s->irr;
+ }
} else {
ret = s->imr;
}
@@ -410,7 +423,7 @@ static const VMStateDescription vmstate_pic = {
.version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
- .fields = (VMStateField []) {
+ .fields = (VMStateField[]) {
VMSTATE_UINT8(last_irr, PicState),
VMSTATE_UINT8(irr, PicState),
VMSTATE_UINT8(imr, PicState),
@@ -474,9 +487,9 @@ void pic_info(Monitor *mon)
int i;
PicState *s;
- if (!isa_pic)
+ if (!isa_pic) {
return;
-
+ }
for (i = 0; i < 2; i++) {
s = i == 0 ? isa_pic : slave_pic;
monitor_printf(mon, "pic%d: irr=%02x imr=%02x isr=%02x hprio=%d "
@@ -498,8 +511,9 @@ void irq_info(Monitor *mon)
monitor_printf(mon, "IRQ statistics:\n");
for (i = 0; i < 16; i++) {
count = irq_count[i];
- if (count > 0)
+ if (count > 0) {
monitor_printf(mon, "%2d: %" PRId64 "\n", i, count);
+ }
}
#endif
}
--
1.7.3.4
- [Qemu-devel] [PATCH v2 15/23] i8259: Clean up pic_ioport_read, (continued)
- [Qemu-devel] [PATCH v2 15/23] i8259: Clean up pic_ioport_read, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 14/23] i8259: Fix poll command, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 17/23] i8259: Replace PicState::pics_state with master flag, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 12/23] i8259: Clear ELCR on reset, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 02/23] pc: Generalize ISA IRQs to GSIs, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 19/23] qdev: Add HEX8 property, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 16/23] i8259: PREP: Replace pic_intack_read with pic_read_irq, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 21/23] i8259: Fix coding style,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 22/23] monitor: Restrict pic/irq_info to supporting targets, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 18/23] i8259: Eliminate PicState2, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 20/23] i8259: Convert to qdev, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 23/23] i8259: Move to hw library, Jan Kiszka, 2011/10/07
- Re: [Qemu-devel] [PATCH v2 00/23] Rework i8259 and PC interrupt models, Blue Swirl, 2011/10/15
- Re: [Qemu-devel] [PATCH v2 00/23] Rework i8259 and PC interrupt models, Blue Swirl, 2011/10/16