From patchwork Mon Feb 21 20:57:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 189 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:40:44 -0000 Delivered-To: patches@linaro.org Received: by 10.224.19.208 with SMTP id c16cs202823qab; Mon, 21 Feb 2011 12:58:00 -0800 (PST) Received: by 10.142.51.13 with SMTP id y13mr1526916wfy.236.1298321878944; Mon, 21 Feb 2011 12:57:58 -0800 (PST) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id n4si9663903wfl.8.2011.02.21.12.57.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 Feb 2011 12:57:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1PrcpN-0004Rn-P5; Mon, 21 Feb 2011 20:57:53 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 4/5] hw/irq: Add qemu_irq_split() so one GPIO output can feed two inputs Date: Mon, 21 Feb 2011 20:57:52 +0000 Message-Id: <1298321873-17064-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1298321873-17064-1-git-send-email-peter.maydell@linaro.org> References: <1298321873-17064-1-git-send-email-peter.maydell@linaro.org> Add a qemu_irq_split() function which allows a board to wire a single GPIO output up to two GPIO inputs. This is needed for realview boards, where the MMC card status is visible both in a system register and via a PL061 GPIO module. Signed-off-by: Peter Maydell --- hw/irq.c | 15 +++++++++++++++ hw/irq.h | 3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/irq.c b/hw/irq.c index 7703f62..4035a8c 100644 --- a/hw/irq.c +++ b/hw/irq.c @@ -75,3 +75,18 @@ qemu_irq qemu_irq_invert(qemu_irq irq) qemu_irq_raise(irq); return qemu_allocate_irqs(qemu_notirq, irq, 1)[0]; } + +static void qemu_splitirq(void *opaque, int line, int level) +{ + struct IRQState **irq = opaque; + irq[0]->handler(irq[0]->opaque, irq[0]->n, level); + irq[1]->handler(irq[1]->opaque, irq[1]->n, level); +} + +qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2) +{ + qemu_irq *s = qemu_mallocz(2 * sizeof(qemu_irq)); + s[0] = irq1; + s[1] = irq2; + return qemu_allocate_irqs(qemu_splitirq, s, 1)[0]; +} diff --git a/hw/irq.h b/hw/irq.h index f7849ed..389ed7a 100644 --- a/hw/irq.h +++ b/hw/irq.h @@ -30,4 +30,7 @@ void qemu_free_irqs(qemu_irq *s); /* Returns a new IRQ with opposite polarity. */ qemu_irq qemu_irq_invert(qemu_irq irq); +/* Returns a new IRQ which feeds into both the passed IRQs */ +qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2); + #endif