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

dino: remove unused dino_set_timer_irq() IRQ handler 

According to the comments in dino.c the timer IRQ is unused, so remove the empty
dino_set_timer_irq() handler function and simply pass NULL to mc146818_rtc_init()
in machine.c instead.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Helge Deller <deller@gmx.de>
Message-Id: <20220504092600.10048-19-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2022-05-04 10:25:28 +01:00
parent a4b74c1924
commit 36f9bbdb17
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/hppa/dino.c
View File

@ -399,13 +399,7 @@ static int dino_pci_map_irq(PCIDevice *d, int irq_num)
return slot & 0x03; return slot & 0x03;
} }
static void dino_set_timer_irq(void *opaque, int irq, int level) DinoState *dino_init(MemoryRegion *addr_space)
{
/* ??? Not connected. */
}
DinoState *dino_init(MemoryRegion *addr_space,
qemu_irq *p_rtc_irq)
{ {
DeviceState *dev; DeviceState *dev;
DinoState *s; DinoState *s;
@ -416,8 +410,6 @@ DinoState *dino_init(MemoryRegion *addr_space,
s = DINO_PCI_HOST_BRIDGE(dev); s = DINO_PCI_HOST_BRIDGE(dev);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
*p_rtc_irq = qemu_allocate_irq(dino_set_timer_irq, s, 0);
return s; return s;
} }

2
hw/hppa/hppa_sys.h
View File

@ -11,7 +11,7 @@
#include "hppa_hardware.h" #include "hppa_hardware.h"
#include "dino.h" #include "dino.h"
DinoState *dino_init(MemoryRegion *, qemu_irq *); DinoState *dino_init(MemoryRegion *);
DeviceState *lasi_init(MemoryRegion *); DeviceState *lasi_init(MemoryRegion *);
#define enable_lasi_lan() 0 #define enable_lasi_lan() 0

5
hw/hppa/machine.c
View File

@ -130,7 +130,6 @@ static void machine_hppa_init(MachineState *machine)
DeviceState *dev, *dino_dev; DeviceState *dev, *dino_dev;
PCIBus *pci_bus; PCIBus *pci_bus;
ISABus *isa_bus; ISABus *isa_bus;
qemu_irq rtc_irq;
char *firmware_filename; char *firmware_filename;
uint64_t firmware_low, firmware_high; uint64_t firmware_low, firmware_high;
long size; long size;
@ -167,7 +166,7 @@ static void machine_hppa_init(MachineState *machine)
lasi_init(addr_space); lasi_init(addr_space);
/* Init Dino (PCI host bus chip). */ /* Init Dino (PCI host bus chip). */
dino_dev = DEVICE(dino_init(addr_space, &rtc_irq)); dino_dev = DEVICE(dino_init(addr_space));
memory_region_add_subregion(addr_space, DINO_HPA, memory_region_add_subregion(addr_space, DINO_HPA,
sysbus_mmio_get_region( sysbus_mmio_get_region(
SYS_BUS_DEVICE(dino_dev), 0)); SYS_BUS_DEVICE(dino_dev), 0));
@ -179,7 +178,7 @@ static void machine_hppa_init(MachineState *machine)
assert(isa_bus); assert(isa_bus);
/* Realtime clock, used by firmware for PDC_TOD call. */ /* Realtime clock, used by firmware for PDC_TOD call. */
mc146818_rtc_init(isa_bus, 2000, rtc_irq); mc146818_rtc_init(isa_bus, 2000, NULL);
/* Serial code setup. */ /* Serial code setup. */
if (serial_hd(0)) { if (serial_hd(0)) {