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: 3815 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4DB0E23F26 for ; Wed, 31 Aug 2011 20:49:50 +0000 (UTC) Received: from mail-ey0-f170.google.com (mail-ey0-f170.google.com [209.85.215.170]) by fiordland.canonical.com (Postfix) with ESMTP id 43AF7A1857F for ; Wed, 31 Aug 2011 20:49:50 +0000 (UTC) Received: by eyd10 with SMTP id 10so1501699eyd.29 for ; Wed, 31 Aug 2011 13:49:50 -0700 (PDT) Received: by 10.223.4.133 with SMTP id 5mr517044far.81.1314823789866; Wed, 31 Aug 2011 13:49:49 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs30693lab; Wed, 31 Aug 2011 13:49:49 -0700 (PDT) Received: by 10.204.134.21 with SMTP id h21mr469988bkt.186.1314823788814; Wed, 31 Aug 2011 13:49:48 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id ac14si2609596bkc.7.2011.08.31.13.49.47 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Aug 2011 13:49:47 -0700 (PDT) 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 1QyrjB-00005P-63; Wed, 31 Aug 2011 21:49:41 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , Riku Voipio , Gerd Hoffmann , patches@linaro.org Subject: [PATCH 2/3] usb-musb: Take a DeviceState* in init function 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> 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);