Revision e8935eef
| b/hw/fdc.c | ||
|---|---|---|
| 1878 | 1878 |
fdctrl_t *fdctrl; |
| 1879 | 1879 |
ISADevice *dev; |
| 1880 | 1880 |
|
| 1881 |
dev = isa_create_simple("isa-fdc", io_base, 0);
|
|
| 1881 |
dev = isa_create_simple("isa-fdc", io_base, 0, isairq, -1);
|
|
| 1882 | 1882 |
fdctrl = &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state); |
| 1883 |
isa_connect_irq(dev, 0, isairq); |
|
| 1884 | 1883 |
|
| 1885 | 1884 |
fdctrl->dma_chann = dma_chann; |
| 1886 | 1885 |
DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl); |
| b/hw/isa-bus.c | ||
|---|---|---|
| 121 | 121 |
qdev_register(&info->qdev); |
| 122 | 122 |
} |
| 123 | 123 |
|
| 124 |
ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2) |
|
| 124 |
ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, |
|
| 125 |
uint32_t irq, uint32 irq2) |
|
| 125 | 126 |
{
|
| 126 | 127 |
DeviceState *dev; |
| 127 | 128 |
ISADevice *isa; |
| ... | ... | |
| 135 | 136 |
isa->iobase[0] = iobase; |
| 136 | 137 |
isa->iobase[1] = iobase2; |
| 137 | 138 |
qdev_init(dev); |
| 139 |
if (-1 != irq) |
|
| 140 |
isa_connect_irq(isa, 0, irq); |
|
| 141 |
if (-1 != irq2) |
|
| 142 |
isa_connect_irq(isa, 1, irq2); |
|
| 138 | 143 |
return isa; |
| 139 | 144 |
} |
| 140 | 145 |
|
| b/hw/isa.h | ||
|---|---|---|
| 30 | 30 |
qemu_irq isa_reserve_irq(int isairq); |
| 31 | 31 |
void isa_init_irq(ISADevice *dev, qemu_irq *p); |
| 32 | 32 |
void isa_qdev_register(ISADeviceInfo *info); |
| 33 |
ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2); |
|
| 33 |
ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, |
|
| 34 |
uint32_t irq, uint32_t irq2); |
|
| 34 | 35 |
|
| 35 | 36 |
extern target_phys_addr_t isa_mem_base; |
| 36 | 37 |
|
| b/hw/pc.c | ||
|---|---|---|
| 1376 | 1376 |
} |
| 1377 | 1377 |
} |
| 1378 | 1378 |
|
| 1379 |
isa_dev = isa_create_simple("i8042", 0x60, 0x64);
|
|
| 1380 |
isa_connect_irq(isa_dev, 0, 1); |
|
| 1381 |
isa_connect_irq(isa_dev, 1, 12); |
|
| 1379 |
isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12);
|
|
| 1382 | 1380 |
DMA_init(0); |
| 1383 | 1381 |
#ifdef HAS_AUDIO |
| 1384 | 1382 |
audio_init(pci_enabled ? pci_bus : NULL, isa_irq); |
Also available in: Unified diff