Revision 2091ba23 hw/pc.c
b/hw/pc.c | ||
---|---|---|
1283 | 1283 |
piix3_devfn = piix3_init(pci_bus, -1); |
1284 | 1284 |
} else { |
1285 | 1285 |
pci_bus = NULL; |
1286 |
isa_bus_new(NULL); |
|
1286 | 1287 |
} |
1288 |
isa_bus_irqs(isa_irq); |
|
1287 | 1289 |
|
1288 | 1290 |
/* init basic PC hardware */ |
1289 | 1291 |
register_ioport_write(0x80, 1, 1, ioport80_write, NULL); |
... | ... | |
1372 | 1374 |
} |
1373 | 1375 |
|
1374 | 1376 |
isa_dev = isa_create_simple("i8042", 0x60, 0x64); |
1375 |
isa_connect_irq(isa_dev, 0, isa_irq[1]);
|
|
1376 |
isa_connect_irq(isa_dev, 1, isa_irq[12]);
|
|
1377 |
isa_connect_irq(isa_dev, 0, 1);
|
|
1378 |
isa_connect_irq(isa_dev, 1, 12);
|
|
1377 | 1379 |
DMA_init(0); |
1378 | 1380 |
#ifdef HAS_AUDIO |
1379 | 1381 |
audio_init(pci_enabled ? pci_bus : NULL, isa_irq); |
... | ... | |
1383 | 1385 |
dinfo = drive_get(IF_FLOPPY, 0, i); |
1384 | 1386 |
fd[i] = dinfo ? dinfo->bdrv : NULL; |
1385 | 1387 |
} |
1386 |
floppy_controller = fdctrl_init(isa_irq[6], 2, 0, 0x3f0, fd);
|
|
1388 |
floppy_controller = fdctrl_init_isa(6, 2, 0x3f0, fd);
|
|
1387 | 1389 |
|
1388 | 1390 |
cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd); |
1389 | 1391 |
|
Also available in: Unified diff