diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-08-23 12:23:30 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-08-23 12:23:30 +0000 |
| commit | d453c2c32ed2bf6cfccb6c2463416c4a613eb708 (patch) | |
| tree | 3102ce55f276212e2bd1b47a320537ff66d4d464 /hw/sun4m.c | |
| parent | 7432ff5d6b70b58d6d3d9417cf87d2fe9ba2ce6c (diff) | |
Sparc32: fix monitor commands 'info pic' and 'info irq'
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/sun4m.c')
| -rw-r--r-- | hw/sun4m.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index ddc295a9a8..88a0b2511d 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -209,7 +209,7 @@ static void nvram_init(m48t59_t *nvram, uint8_t *macaddr, const char *cmdline, m48t59_write(nvram, i, image[i]); } -static void *slavio_intctl; +static DeviceState *slavio_intctl; void pic_info(Monitor *mon) { @@ -748,7 +748,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, unsigned long kernel_size; BlockDriverState *fd[MAX_FD]; void *fw_cfg; - DeviceState *dev; DriveInfo *dinfo; /* init CPUs */ @@ -768,16 +767,16 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, prom_init(hwdef->slavio_base, bios_name); - dev = slavio_intctl_init(hwdef->intctl_base, - hwdef->intctl_base + 0x10000ULL, - cpu_irqs, - 7); + slavio_intctl = slavio_intctl_init(hwdef->intctl_base, + hwdef->intctl_base + 0x10000ULL, + cpu_irqs, + 7); for (i = 0; i < 32; i++) { - slavio_irq[i] = qdev_get_gpio_in(dev, i); + slavio_irq[i] = qdev_get_gpio_in(slavio_intctl, i); } for (i = 0; i < MAX_CPUS; i++) { - slavio_cpu_irq[i] = qdev_get_gpio_in(dev, 32 + i); + slavio_cpu_irq[i] = qdev_get_gpio_in(slavio_intctl, 32 + i); } if (hwdef->idreg_base) { |