From patchwork Mon Sep 24 09:18:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 186341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AA5A72C0082 for ; Mon, 24 Sep 2012 19:20:29 +1000 (EST) Received: from localhost ([::1]:44397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TG4q3-0005kw-NT for incoming@patchwork.ozlabs.org; Mon, 24 Sep 2012 05:20:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TG4p3-00033Y-Po for qemu-devel@nongnu.org; Mon, 24 Sep 2012 05:19:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TG4ov-0002eB-Ss for qemu-devel@nongnu.org; Mon, 24 Sep 2012 05:19:25 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:48792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TG4ov-0002bX-M2 for qemu-devel@nongnu.org; Mon, 24 Sep 2012 05:19:17 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so896912pbb.4 for ; Mon, 24 Sep 2012 02:19:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=8xHmY8D141P4pGxvqoNgg1Hca+ZAkY5/q9QDBX7P0xY=; b=TEp9JhwBPqADzl7nAoyJYo444KYv6MTPFRBM996OsLpQFeWbmD96ZMAZOJwh7afMmt ZCnPKzSiNYbV4G2E7HCuTuaHDTiP9OT6st+lY/nu7Oglydam43CzZ1y6/y87dVpzbIVN /DkhE5O6joZrsR0ECo2Mw38kt47tp0C4agvS6JgmA7Ul9wKAuFkrgF752EJIuPZU3Ygj EvczNzgscaDCX+bxTt83Hi1AsEocJx0MmLZ0Q0EC48lLzdB0OekikpxQBGY/WChQeMLY OBnCGl+/SFNV352i/yapAC8PbXQdCRKgs059h7E434onNM8XdZVbaf2KeeZuHXLGGOTL nM+w== Received: by 10.68.233.230 with SMTP id tz6mr35490047pbc.42.1348478357268; Mon, 24 Sep 2012 02:19:17 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id y2sm6442560pax.29.2012.09.24.02.19.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 24 Sep 2012 02:19:16 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, paul@codesourcery.com, edgar.iglesias@gmail.com, peter.maydell@linaro.org, stefanha@gmail.com Date: Mon, 24 Sep 2012 19:18:34 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQmI3acs1L+alz8lUdAOECLEUeRW3n7VFc1LfLe3uNEs6KfRMCYi12N9lqG1yr6/uU+5Q4rt X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: blauwirbel@gmail.com, "Peter A. G. Crosthwaite" , i.mitsyanko@samsung.com Subject: [Qemu-devel] [PATCH v7 04/13] qdev: allow multiple qdev_init_gpio_in() calls 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 Allow multiple qdev_init_gpio_in() calls for the one device. The first call will define GPIOs 0-N-1, the next GPIOs N- ... . Allows different GPIOs to be handled with different handlers. Needed when two levels of the QOM class heirachy both define GPIO functionality, as a single GPIO handler with an index selecter is not possible. Signed-off-by: Peter A. G. Crosthwaite --- changed since v5: moved implementation to irq.c as per PMM review hw/irq.c | 17 ++++++++++++++--- hw/irq.h | 11 ++++++++++- hw/qdev.c | 6 +++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/hw/irq.c b/hw/irq.c index d413a0b..cd17551 100644 --- a/hw/irq.c +++ b/hw/irq.c @@ -38,15 +38,20 @@ void qemu_set_irq(qemu_irq irq, int level) irq->handler(irq->opaque, irq->n, level); } -qemu_irq *qemu_allocate_irqs(qemu_irq_handler handler, void *opaque, int n) +qemu_irq *qemu_extend_irqs(qemu_irq *old, int n_old, qemu_irq_handler handler, + void *opaque, int n) { qemu_irq *s; struct IRQState *p; int i; - s = (qemu_irq *)g_malloc0(sizeof(qemu_irq) * n); + if (!old) { + n_old = 0; + } + s = old ? g_renew(qemu_irq, old, n + n_old) : + (qemu_irq *)g_new0(qemu_irq, n); p = (struct IRQState *)g_malloc0(sizeof(struct IRQState) * n); - for (i = 0; i < n; i++) { + for (i = n_old; i < n + n_old; i++) { p->handler = handler; p->opaque = opaque; p->n = i; @@ -56,6 +61,12 @@ qemu_irq *qemu_allocate_irqs(qemu_irq_handler handler, void *opaque, int n) return s; } +qemu_irq *qemu_allocate_irqs(qemu_irq_handler handler, void *opaque, int n) +{ + return qemu_extend_irqs(NULL, 0, handler, opaque, n); +} + + void qemu_free_irqs(qemu_irq *s) { g_free(s[0]); diff --git a/hw/irq.h b/hw/irq.h index 56c55f0..e640c10 100644 --- a/hw/irq.h +++ b/hw/irq.h @@ -23,8 +23,17 @@ static inline void qemu_irq_pulse(qemu_irq irq) qemu_set_irq(irq, 0); } -/* Returns an array of N IRQs. */ +/* Returns an array of N IRQs. Each IRQ is assigned the argument handler and + * opaque data. + */ qemu_irq *qemu_allocate_irqs(qemu_irq_handler handler, void *opaque, int n); + +/* Extends an Array of IRQs. Old IRQs have their handlers and opaque data + * preserved. New IRQs are assigned the argument handler and opaque data. + */ +qemu_irq *qemu_extend_irqs(qemu_irq *old, int n_old, qemu_irq_handler handler, + void *opaque, int n); + void qemu_free_irqs(qemu_irq *s); /* Returns a new IRQ with opposite polarity. */ diff --git a/hw/qdev.c b/hw/qdev.c index b5a52ac..eea9eae 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -291,9 +291,9 @@ BusState *qdev_get_parent_bus(DeviceState *dev) void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handler handler, int n) { - assert(dev->num_gpio_in == 0); - dev->num_gpio_in = n; - dev->gpio_in = qemu_allocate_irqs(handler, dev, n); + dev->gpio_in = qemu_extend_irqs(dev->gpio_in, dev->num_gpio_in, handler, + dev, n); + dev->num_gpio_in += n; } void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n)