diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 15:40:08 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 15:40:08 +0000 |
| commit | 53e621704c9734d68fcae52d89ff00680df53044 (patch) | |
| tree | 5d0df45382fd56599ad8bd78eedb9844cfa0282d /hw/milkymist-hw.h | |
| parent | 211685040f4e579f83a3ed8b3aa7a3f363ad384f (diff) | |
| parent | 779277cab4ab748dea3dfc8c8e035c7a40523e1b (diff) | |
| download | qemu-53e621704c9734d68fcae52d89ff00680df53044.tar.gz | |
Merge branch 'for-upstream' of git://git.serverraum.org/git/mw/qemu-lm32
* 'for-upstream' of git://git.serverraum.org/git/mw/qemu-lm32:
milkymist: new interrupt map
milkymist_uart: support new core version
lm32: add missing qemu_init_vcpu() call
Diffstat (limited to 'hw/milkymist-hw.h')
| -rw-r--r-- | hw/milkymist-hw.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h index 20de68ecce..9f358a7d69 100644 --- a/hw/milkymist-hw.h +++ b/hw/milkymist-hw.h @@ -5,15 +5,14 @@ #include "qdev-addr.h" static inline DeviceState *milkymist_uart_create(target_phys_addr_t base, - qemu_irq rx_irq, qemu_irq tx_irq) + qemu_irq irq) { DeviceState *dev; dev = qdev_create(NULL, "milkymist-uart"); qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, rx_irq); - sysbus_connect_irq(sysbus_from_qdev(dev), 1, tx_irq); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); return dev; } |