Revision 52cc07d0 hw/sun4m.c
b/hw/sun4m.c | ||
---|---|---|
184 | 184 |
|
185 | 185 |
void pic_set_irq(int irq, int level) |
186 | 186 |
{ |
187 |
slavio_pic_set_irq(slavio_intctl, irq, level); |
|
188 |
} |
|
189 |
|
|
190 |
void pic_set_irq_new(void *opaque, int irq, int level) |
|
191 |
{ |
|
192 |
pic_set_irq(irq, level); |
|
193 |
} |
|
194 |
|
|
195 |
void pic_set_irq_cpu(int irq, int level, unsigned int cpu) |
|
196 |
{ |
|
197 |
slavio_pic_set_irq_cpu(slavio_intctl, irq, level, cpu); |
|
187 |
pic_set_irq_new(slavio_intctl, irq, level); |
|
198 | 188 |
} |
199 | 189 |
|
200 | 190 |
static void *slavio_misc; |
... | ... | |
261 | 251 |
nvram = m48t59_init(0, hwdef->nvram_base, 0, hwdef->nvram_size, 8); |
262 | 252 |
for (i = 0; i < MAX_CPUS; i++) { |
263 | 253 |
slavio_timer_init(hwdef->counter_base + i * TARGET_PAGE_SIZE, |
264 |
hwdef->clock_irq, 0, i); |
|
254 |
hwdef->clock_irq, 0, i, slavio_intctl);
|
|
265 | 255 |
} |
266 | 256 |
slavio_timer_init(hwdef->counter_base + 0x10000, hwdef->clock1_irq, 2, |
267 |
(unsigned int)-1); |
|
268 |
slavio_serial_ms_kbd_init(hwdef->ms_kb_base, hwdef->ms_kb_irq); |
|
257 |
(unsigned int)-1, slavio_intctl); |
|
258 |
slavio_serial_ms_kbd_init(hwdef->ms_kb_base, hwdef->ms_kb_irq, |
|
259 |
slavio_intctl); |
|
269 | 260 |
// Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device |
270 | 261 |
// Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device |
271 | 262 |
slavio_serial_init(hwdef->serial_base, hwdef->ser_irq, |
272 |
serial_hds[1], serial_hds[0]); |
|
263 |
serial_hds[1], serial_hds[0], slavio_intctl);
|
|
273 | 264 |
fdctrl_init(hwdef->fd_irq, 0, 1, hwdef->fd_base, fd_table); |
274 | 265 |
main_esp = esp_init(bs_table, hwdef->esp_base, dma); |
275 | 266 |
|
... | ... | |
279 | 270 |
} |
280 | 271 |
} |
281 | 272 |
|
282 |
slavio_misc = slavio_misc_init(hwdef->slavio_base, hwdef->me_irq); |
|
273 |
slavio_misc = slavio_misc_init(hwdef->slavio_base, hwdef->me_irq, |
|
274 |
slavio_intctl); |
|
283 | 275 |
cs_init(hwdef->cs_base, hwdef->cs_irq, slavio_intctl); |
284 | 276 |
sparc32_dma_set_reset_data(dma, main_esp, main_lance); |
285 | 277 |
} |
Also available in: Unified diff