ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/m68k/next-cube: Make next_irq GPIO inputs to NEXT_PC device 

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>
This commit is contained in:
Peter Maydell 2021-01-15 20:12:02 +00:00 committed by Thomas Huth
parent ac99317b5f
commit d9cd403972
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/m68k/next-cube.c
View File

@ -735,10 +735,6 @@ static const MemoryRegionOps dma_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .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) static void next_irq(void *opaque, int number, int level)
{ {
NeXTPC *s = NEXT_PC(opaque); 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) static void next_escc_init(DeviceState *pcdev)
{ {
qemu_irq *ser_irq = qemu_allocate_irqs(next_serial_irq, pcdev, 2);
DeviceState *dev; DeviceState *dev;
SysBusDevice *s; SysBusDevice *s;
@ -867,8 +852,8 @@ static void next_escc_init(DeviceState *pcdev)
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
sysbus_connect_irq(s, 0, ser_irq[0]); sysbus_connect_irq(s, 0, qdev_get_gpio_in(pcdev, NEXT_SCC_I));
sysbus_connect_irq(s, 1, ser_irq[1]); sysbus_connect_irq(s, 1, qdev_get_gpio_in(pcdev, NEXT_SCC_DMA_I));
sysbus_mmio_map(s, 0, 0x2118000); sysbus_mmio_map(s, 0, 0x2118000);
} }
@ -887,6 +872,8 @@ static void next_pc_realize(DeviceState *dev, Error **errp)
NeXTPC *s = NEXT_PC(dev); NeXTPC *s = NEXT_PC(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(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, memory_region_init_io(&s->mmiomem, OBJECT(s), &mmio_ops, s,
"next.mmio", 0xD0000); "next.mmio", 0xD0000);
memory_region_init_io(&s->scrmem, OBJECT(s), &scr_ops, s, memory_region_init_io(&s->scrmem, OBJECT(s), &scr_ops, s,

3
include/hw/m68k/next-cube.h
View File

@ -39,7 +39,8 @@ enum next_irqs {
NEXT_ENRX_DMA_I, NEXT_ENRX_DMA_I,
NEXT_SCSI_DMA_I, NEXT_SCSI_DMA_I,
NEXT_SCC_DMA_I, NEXT_SCC_DMA_I,
NEXT_SND_I NEXT_SND_I,
NEXT_NUM_IRQS
}; };
#endif /* NEXT_CUBE_H */ #endif /* NEXT_CUBE_H */