[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/11] hw/m68k/next-cube: Make next_irq GPIO inputs to NEXT_PC dev
From: |
Thomas Huth |
Subject: |
[PULL 07/11] hw/m68k/next-cube: Make next_irq GPIO inputs to NEXT_PC device |
Date: |
Tue, 19 Jan 2021 09:36:13 +0100 |
From: Peter Maydell <peter.maydell@linaro.org>
Make the next_irq function be GPIO inputs to the NEXT_PC
device, rather than a freestanding set of qemu_irq lines.
This fixes a minor Coverity issue where it correctly points
out the trivial memory leak of the memory allocated in the
call to qemu_allocate_irqs().
Fixes: CID 1421962
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210115201206.17347-8-peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
hw/m68k/next-cube.c | 21 ++++-----------------
include/hw/m68k/next-cube.h | 3 ++-
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index 9b9b051231..7dcd39aab9 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -735,10 +735,6 @@ static const MemoryRegionOps dma_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-/*
- * TODO: set the shift numbers as values in the enum, so the first switch
- * will not be needed
- */
static void next_irq(void *opaque, int number, int level)
{
NeXTPC *s = NEXT_PC(opaque);
@@ -839,19 +835,8 @@ static void next_irq(void *opaque, int number, int level)
}
}
-static void next_serial_irq(void *opaque, int n, int level)
-{
- /* DPRINTF("SCC IRQ NUM %i\n",n); */
- if (n) {
- next_irq(opaque, NEXT_SCC_DMA_I, level);
- } else {
- next_irq(opaque, NEXT_SCC_I, level);
- }
-}
-
static void next_escc_init(DeviceState *pcdev)
{
- qemu_irq *ser_irq = qemu_allocate_irqs(next_serial_irq, pcdev, 2);
DeviceState *dev;
SysBusDevice *s;
@@ -867,8 +852,8 @@ static void next_escc_init(DeviceState *pcdev)
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
- sysbus_connect_irq(s, 0, ser_irq[0]);
- sysbus_connect_irq(s, 1, ser_irq[1]);
+ sysbus_connect_irq(s, 0, qdev_get_gpio_in(pcdev, NEXT_SCC_I));
+ sysbus_connect_irq(s, 1, qdev_get_gpio_in(pcdev, NEXT_SCC_DMA_I));
sysbus_mmio_map(s, 0, 0x2118000);
}
@@ -887,6 +872,8 @@ static void next_pc_realize(DeviceState *dev, Error **errp)
NeXTPC *s = NEXT_PC(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ qdev_init_gpio_in(dev, next_irq, NEXT_NUM_IRQS);
+
memory_region_init_io(&s->mmiomem, OBJECT(s), &mmio_ops, s,
"next.mmio", 0xD0000);
memory_region_init_io(&s->scrmem, OBJECT(s), &scr_ops, s,
diff --git a/include/hw/m68k/next-cube.h b/include/hw/m68k/next-cube.h
index 5a56c354b8..d38c52d540 100644
--- a/include/hw/m68k/next-cube.h
+++ b/include/hw/m68k/next-cube.h
@@ -39,7 +39,8 @@ enum next_irqs {
NEXT_ENRX_DMA_I,
NEXT_SCSI_DMA_I,
NEXT_SCC_DMA_I,
- NEXT_SND_I
+ NEXT_SND_I,
+ NEXT_NUM_IRQS
};
#endif /* NEXT_CUBE_H */
--
2.29.2
- [PULL 00/11] m68k next-cube patches, Thomas Huth, 2021/01/19
- [PULL 01/11] hw/m68k/next-cube: Make next_irq() function static, Thomas Huth, 2021/01/19
- [PULL 02/11] hw/m68k/next-cube: Move register/interrupt functionality into a device, Thomas Huth, 2021/01/19
- [PULL 03/11] hw/m68k/next-cube: Move mmio_ops into NeXTPC device, Thomas Huth, 2021/01/19
- [PULL 05/11] hw/m68k/next-cube: Make next_irq take NeXTPC* as its opaque, Thomas Huth, 2021/01/19
- [PULL 10/11] hw/m68k/next-cube: Add vmstate for NeXTPC device, Thomas Huth, 2021/01/19
- [PULL 04/11] hw/m68k/next-cube: Move scr_ops into NeXTPC device, Thomas Huth, 2021/01/19
- [PULL 11/11] hw/m68k/next-cube: Add missing header comment to next-cube.h, Thomas Huth, 2021/01/19
- [PULL 06/11] hw/m68k/next-cube: Move int_status and int_mask to NeXTPC struct, Thomas Huth, 2021/01/19
- [PULL 07/11] hw/m68k/next-cube: Make next_irq GPIO inputs to NEXT_PC device,
Thomas Huth <=
- [PULL 08/11] hw/m68k/next-cube: Move rtc into NeXTPC struct, Thomas Huth, 2021/01/19
- [PULL 09/11] hw/m68k/next-cube: Remove unused fields from NeXTState, Thomas Huth, 2021/01/19
- Re: [PULL 00/11] m68k next-cube patches, Peter Maydell, 2021/01/19