From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJW8-0006vB-NO for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWJW3-0006i2-1s for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:11 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:57782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJW2-0006hi-Cg for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 14 Jun 2011 04:37:46 +0200 Message-Id: <1308019077-61957-13-git-send-email-andreas.faerber@web.de> In-Reply-To: <1308019077-61957-12-git-send-email-andreas.faerber@web.de> References: <1308019077-61957-1-git-send-email-andreas.faerber@web.de> <1308019077-61957-2-git-send-email-andreas.faerber@web.de> <1308019077-61957-3-git-send-email-andreas.faerber@web.de> <1308019077-61957-4-git-send-email-andreas.faerber@web.de> <1308019077-61957-5-git-send-email-andreas.faerber@web.de> <1308019077-61957-6-git-send-email-andreas.faerber@web.de> <1308019077-61957-7-git-send-email-andreas.faerber@web.de> <1308019077-61957-8-git-send-email-andreas.faerber@web.de> <1308019077-61957-9-git-send-email-andreas.faerber@web.de> <1308019077-61957-10-git-send-email-andreas.faerber@web.de> <1308019077-61957-11-git-send-email-andreas.faerber@web.de> <1308019077-61957-12-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gerd Hoffmann , Markus Armbruster 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 Cc: Markus Armbruster Signed-off-by: Andreas F=C3=A4rber --- 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 isa= irq) dev->nirqs++; } =20 +void isa_uninit_irq(ISADevice *dev, qemu_irq *p, int isairq) +{ + int i, j; + for (i =3D 0; i < dev->nirqs; i++) { + if (dev->isairq[i] =3D=3D isairq) { + for (j =3D i + 1; j < dev->nirqs; j++) { + dev->isairq[j - 1] =3D dev->isairq[j]; + } + dev->nirqs--; + break; + } + } + if (p !=3D NULL) { + *p =3D 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 leng= th); void isa_discard_ioport_range(ISADevice *dev, uint16_t start, uint16_t l= ength); --=20 1.7.5.3