diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-08-31 21:49:40 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-09-07 09:58:27 +0200 |
| commit | 406c20754a29586f6dc1fccacbca3792be24922c (patch) | |
| tree | d15e1050cbd8d53927d629dda12f712919fbe0b9 /hw/tusb6010.c | |
| parent | 9147b752887d65dfe2431f0fbff1d4a2545344d0 (diff) | |
usb-musb: Take a DeviceState* in init function
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 <peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/tusb6010.c')
| -rw-r--r-- | hw/tusb6010.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/tusb6010.c b/hw/tusb6010.c index 78814f132c..57fe8045b8 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; } |