From patchwork Mon Jun 6 16:20:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 98986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A1763B6F82 for ; Tue, 7 Jun 2011 04:28:30 +1000 (EST) Received: from localhost ([::1]:46388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTeXK-0001gd-Ek for incoming@patchwork.ozlabs.org; Mon, 06 Jun 2011 14:28:26 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcY8-0002Bn-10 for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:21:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QTcY6-0002ku-1l for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:21:07 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:33155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QTcY5-0002kQ-I3 for qemu-devel@nongnu.org; Mon, 06 Jun 2011 12:21:05 -0400 Received: from smtp06.web.de ( [172.20.5.172]) by fmmailgate02.web.de (Postfix) with ESMTP id 9A0BF1A244A19; Mon, 6 Jun 2011 18:21:04 +0200 (CEST) Received: from [87.173.123.2] (helo=af.local) by smtp06.web.de with asmtp (WEB.DE 4.110 #2) id 1QTcY3-00089p-01; Mon, 06 Jun 2011 18:21:03 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2011 18:20:55 +0200 Message-Id: <1307377259-41434-7-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1307377259-41434-6-git-send-email-andreas.faerber@web.de> References: <1307377259-41434-1-git-send-email-andreas.faerber@web.de> <1307377259-41434-2-git-send-email-andreas.faerber@web.de> <1307377259-41434-3-git-send-email-andreas.faerber@web.de> <1307377259-41434-4-git-send-email-andreas.faerber@web.de> <1307377259-41434-5-git-send-email-andreas.faerber@web.de> <1307377259-41434-6-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX18s6mWH+v5yWaie7fVLwiopPPeGHog1smEkqsrL dau7l2uHDHh2ALxINutF1N272Qrlxped//KUIYYQohQro27G6L 2IFtQnb8p2EknUiAzyjw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, kraxel@redhat.com Subject: [Qemu-devel] [RFC 06/10] serial: Allow to reconfigure ISA IRQ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Andreas Färber --- hw/isa.h | 1 + hw/serial.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/hw/isa.h b/hw/isa.h index 8bd082a..b577fe3 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -47,6 +47,7 @@ void parallel_isa_reconfigure_irq(ISADevice *dev, uint32_t isairq); /* serial.c */ void serial_isa_reconfigure_iobase(ISADevice *dev, uint32_t base); +void serial_isa_reconfigure_irq(ISADevice *dev, uint32_t isairq); /* dma.c */ int DMA_get_channel_mode (int nchan); diff --git a/hw/serial.c b/hw/serial.c index dd91272..714e5b2 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -771,6 +771,17 @@ void serial_isa_reconfigure_iobase(ISADevice *dev, uint32_t iobase) } } +void serial_isa_reconfigure_irq(ISADevice *dev, uint32_t isairq) +{ + ISASerialState *isa = DO_UPCAST(ISASerialState, dev, dev); + + if (isairq != isa->isairq) { + isa_discard_irq(dev, isa->isairq); + isa->isairq = isairq; + isa_init_irq(dev, &isa->state.irq, isa->isairq); + } +} + static const int isa_serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; static const int isa_serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 };