[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ |
Date: |
Tue, 14 Jun 2011 04:37:46 +0200 |
ISADevices keep a list of numeric IRQs. Remove one from that list.
Also optionally NULL the qemu_irq, calling it "uninit" for symmetry.
Cc: Gerd Hoffmann <address@hidden>
Cc: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/isa-bus.c | 17 +++++++++++++++++
hw/isa.h | 1 +
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 6e33d80..d037ed3 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -80,6 +80,23 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
dev->nirqs++;
}
+void isa_uninit_irq(ISADevice *dev, qemu_irq *p, int isairq)
+{
+ int i, j;
+ for (i = 0; i < dev->nirqs; i++) {
+ if (dev->isairq[i] == isairq) {
+ for (j = i + 1; j < dev->nirqs; j++) {
+ dev->isairq[j - 1] = dev->isairq[j];
+ }
+ dev->nirqs--;
+ break;
+ }
+ }
+ if (p != NULL) {
+ *p = NULL;
+ }
+}
+
static void isa_init_ioport_one(ISADevice *dev, uint16_t ioport)
{
assert(dev->nioports < ARRAY_SIZE(dev->ioports));
diff --git a/hw/isa.h b/hw/isa.h
index fe1a20c..72829bb 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -32,6 +32,7 @@ ISABus *isa_bus_new(DeviceState *dev);
void isa_bus_irqs(qemu_irq *irqs);
qemu_irq isa_get_irq(int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
+void isa_uninit_irq(ISADevice *dev, qemu_irq *p, int isairq);
void isa_init_ioport(ISADevice *dev, uint16_t ioport);
void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length);
void isa_discard_ioport_range(ISADevice *dev, uint16_t start, uint16_t length);
--
1.7.5.3
- [Qemu-devel] [RFC 02/23] prep: qdev'ify PCI, (continued)
- [Qemu-devel] [RFC 02/23] prep: qdev'ify PCI, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 03/23] prep: Prepare emulation of an IBM RS/6000 6015 / 7020 (40p), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 04/23] 40p: Add PCI host, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 05/23] prep: Add i82374 DMA emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 06/23] prep: Add i82378 PCI-to-ISA bridge emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378), Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 08/23] qdev: Add support for property type bool, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 09/23] qdev: Add helpers for reading properties, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 10/23] isa: Provide enable and disable callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 11/23] isa: Allow to un-assign I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ,
Andreas Färber <=
- [Qemu-devel] [RFC v5 13/23] parallel: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 14/23] serial: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 16/23] fdc: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 17/23] ide: Allow to discard I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 18/23] ide: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 19/23] prep: Add pc87312 Super I/O emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 20/23] 40p: Add the Super I/O chip (pc87312), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 22/23] prep: qdev'ify System I/O (WIP), Andreas Färber, 2011/06/13