Revision d453c2c3 hw/sun4m.c
| b/hw/sun4m.c | ||
|---|---|---|
| 209 | 209 |
m48t59_write(nvram, i, image[i]); |
| 210 | 210 |
} |
| 211 | 211 |
|
| 212 |
static void *slavio_intctl;
|
|
| 212 |
static DeviceState *slavio_intctl;
|
|
| 213 | 213 |
|
| 214 | 214 |
void pic_info(Monitor *mon) |
| 215 | 215 |
{
|
| ... | ... | |
| 748 | 748 |
unsigned long kernel_size; |
| 749 | 749 |
BlockDriverState *fd[MAX_FD]; |
| 750 | 750 |
void *fw_cfg; |
| 751 |
DeviceState *dev; |
|
| 752 | 751 |
DriveInfo *dinfo; |
| 753 | 752 |
|
| 754 | 753 |
/* init CPUs */ |
| ... | ... | |
| 768 | 767 |
|
| 769 | 768 |
prom_init(hwdef->slavio_base, bios_name); |
| 770 | 769 |
|
| 771 |
dev = slavio_intctl_init(hwdef->intctl_base,
|
|
| 772 |
hwdef->intctl_base + 0x10000ULL, |
|
| 773 |
cpu_irqs, |
|
| 774 |
7); |
|
| 770 |
slavio_intctl = slavio_intctl_init(hwdef->intctl_base,
|
|
| 771 |
hwdef->intctl_base + 0x10000ULL,
|
|
| 772 |
cpu_irqs,
|
|
| 773 |
7);
|
|
| 775 | 774 |
|
| 776 | 775 |
for (i = 0; i < 32; i++) {
|
| 777 |
slavio_irq[i] = qdev_get_gpio_in(dev, i);
|
|
| 776 |
slavio_irq[i] = qdev_get_gpio_in(slavio_intctl, i);
|
|
| 778 | 777 |
} |
| 779 | 778 |
for (i = 0; i < MAX_CPUS; i++) {
|
| 780 |
slavio_cpu_irq[i] = qdev_get_gpio_in(dev, 32 + i);
|
|
| 779 |
slavio_cpu_irq[i] = qdev_get_gpio_in(slavio_intctl, 32 + i);
|
|
| 781 | 780 |
} |
| 782 | 781 |
|
| 783 | 782 |
if (hwdef->idreg_base) {
|
Also available in: Unified diff