From patchwork Wed Aug 31 20:49:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 112686 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 6318AB6F77 for ; Thu, 1 Sep 2011 06:56:43 +1000 (EST) Received: from localhost ([::1]:43878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyrpu-0008Nm-1e for incoming@patchwork.ozlabs.org; Wed, 31 Aug 2011 16:56:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyrpj-0008M6-HR for qemu-devel@nongnu.org; Wed, 31 Aug 2011 16:56:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qyrpi-0004qZ-Dq for qemu-devel@nongnu.org; Wed, 31 Aug 2011 16:56:27 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:48746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyrpi-0004qJ-4y for qemu-devel@nongnu.org; Wed, 31 Aug 2011 16:56:26 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QyrjB-00005P-63; Wed, 31 Aug 2011 21:49:41 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 31 Aug 2011 21:49:40 +0100 Message-Id: <1314823781-304-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1314823781-304-1-git-send-email-peter.maydell@linaro.org> References: <1314823781-304-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: Riku Voipio , =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , Gerd Hoffmann , patches@linaro.org Subject: [Qemu-devel] [PATCH 2/3] usb-musb: Take a DeviceState* in init function 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 Initialise usb-musb by passing it a DeviceState* and the offset of the IRQs in its gpio array, rather than a plain pointer to an irq array. This is simpler for callers and also allows us to pass in a valid parent to usb_bus_new(), so the USB bus actually appears in the qdev tree. Signed-off-by: Peter Maydell --- hw/tusb6010.c | 8 +------- hw/usb-musb.c | 10 ++++++---- hw/usb.h | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hw/tusb6010.c b/hw/tusb6010.c index 78814f1..57fe804 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -776,8 +776,6 @@ static void tusb6010_reset(DeviceState *dev) static int tusb6010_init(SysBusDevice *dev) { TUSBState *s = FROM_SYSBUS(TUSBState, dev); - qemu_irq *musb_irqs; - int i; s->otg_timer = qemu_new_timer_ns(vm_clock, tusb_otg_tick, s); s->pwr_timer = qemu_new_timer_ns(vm_clock, tusb_power_tick, s); memory_region_init_io(&s->iomem[1], &tusb_async_ops, s, "tusb-async", @@ -786,11 +784,7 @@ static int tusb6010_init(SysBusDevice *dev) sysbus_init_mmio_region(dev, &s->iomem[1]); sysbus_init_irq(dev, &s->irq); qdev_init_gpio_in(&dev->qdev, tusb6010_irq, musb_irq_max + 1); - musb_irqs = g_new0(qemu_irq, musb_irq_max); - for (i = 0; i < musb_irq_max; i++) { - musb_irqs[i] = qdev_get_gpio_in(&dev->qdev, i + 1); - } - s->musb = musb_init(musb_irqs); + s->musb = musb_init(&dev->qdev, 1); return 0; } diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 799fa6e..640037f 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -314,7 +314,7 @@ struct MUSBEndPoint { }; struct MUSBState { - qemu_irq *irqs; + qemu_irq irqs[musb_irq_max]; USBBus bus; USBPort port; @@ -340,12 +340,14 @@ struct MUSBState { MUSBEndPoint ep[16]; }; -struct MUSBState *musb_init(qemu_irq *irqs) +struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) { MUSBState *s = g_malloc0(sizeof(*s)); int i; - s->irqs = irqs; + for (i = 0; i < musb_irq_max; i++) { + s->irqs[i] = qdev_get_gpio_in(parent_device, gpio_base + i); + } s->faddr = 0x00; s->power = MGC_M_POWER_HSENAB; @@ -369,7 +371,7 @@ struct MUSBState *musb_init(qemu_irq *irqs) usb_packet_init(&s->ep[i].packey[1].p); } - usb_bus_new(&s->bus, &musb_bus_ops, NULL /* FIXME */); + usb_bus_new(&s->bus, &musb_bus_ops, parent_device); usb_register_port(&s->bus, &s->port, s, 0, &musb_port_ops, USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); diff --git a/hw/usb.h b/hw/usb.h index e7ce395..6f5b7ee 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -342,7 +342,7 @@ enum musb_irq_source_e { }; typedef struct MUSBState MUSBState; -MUSBState *musb_init(qemu_irq *irqs); +MUSBState *musb_init(DeviceState *parent_device, int gpio_base); uint32_t musb_core_intr_get(MUSBState *s); void musb_core_intr_clear(MUSBState *s, uint32_t mask); void musb_set_size(MUSBState *s, int epnum, int size, int is_tx);