[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 06/10] i8259: refactor pic_set_irq level logic
From: |
Matthew Ogilvie |
Subject: |
[Qemu-devel] [PATCH v7 06/10] i8259: refactor pic_set_irq level logic |
Date: |
Sun, 25 Nov 2012 14:51:42 -0700 |
No change in functionality.
Clarify that the only difference between level triggered and
edge triggered interrupts is on the leading edge.
Signed-off-by: Matthew Ogilvie <address@hidden>
---
hw/i8259.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/hw/i8259.c b/hw/i8259.c
index 95587cd..9b2ec40 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -140,26 +140,18 @@ static void pic_set_irq(void *opaque, int irq, int level)
}
#endif
- if (s->elcr & mask) {
- /* level triggered */
- if (level) {
+ if (level) {
+ if ((s->last_irr & mask) == 0 || /* edge for edge triggered */
+ (s->elcr & mask)) { /* or level triggered */
s->irr |= mask;
- s->last_irr |= mask;
- } else {
- s->irr &= ~mask;
- s->last_irr &= ~mask;
}
+ s->last_irr |= mask;
} else {
- /* edge triggered */
- if (level) {
- if ((s->last_irr & mask) == 0) {
- s->irr |= mask;
- }
- s->last_irr |= mask;
- } else {
- s->irr &= ~mask;
- s->last_irr &= ~mask;
- }
+ /* Dropping level clears the interrupt regardless of edge trigger
+ * vs level trigger.
+ */
+ s->irr &= ~mask;
+ s->last_irr &= ~mask;
}
pic_update_irq(s);
}
--
1.7.10.2.484.gcd07cc5
- [Qemu-devel] [PATCH v7 00/10] i8254, i8259 and running Microport UNIX (ca 1987), Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 01/10] fix some debug printf format strings, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 05/10] i8259: fix so that dropping IRQ level always clears the interrupt request, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 07/10] i8254/i8259: workaround to make IRQ0 work like before, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 02/10] vl: fix -hdachs/-hda argument order parsing issues, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 08/10] i8254: add comments about fixing timings, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 03/10] qemu-options.hx: mention retrace= VGA option, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 04/10] vga: add some optional CGA compatibility hacks, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 06/10] i8259: refactor pic_set_irq level logic,
Matthew Ogilvie <=
- [Qemu-devel] [PATCH v7 09/10] i8254: prepare for migration compatibility with future fixes, Matthew Ogilvie, 2012/11/25
- [Qemu-devel] [PATCH v7 10/10] FOR FUTURE: fix i8254/i8259 IRQ0 line logic, Matthew Ogilvie, 2012/11/25