SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/ide/piix: Refactor pci_piix_init_ports as pci_piix_init_bus per bus

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230215112712.23110-21-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-02-14 16:28:19 +01:00
parent 511aa9f9e7
commit 533580d738
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/ide/piix.c
View File

@ -121,7 +121,7 @@ static void piix_ide_reset(DeviceState *dev)
pci_set_byte(pci_conf + 0x20, 0x01); /* BMIBA: 20-23h */ pci_set_byte(pci_conf + 0x20, 0x01); /* BMIBA: 20-23h */
} }
static bool pci_piix_init_ports(PCIIDEState *d, Error **errp) static bool pci_piix_init_bus(PCIIDEState *d, unsigned i, Error **errp)
{ {
static const struct { static const struct {
int iobase; int iobase;
@ -131,9 +131,8 @@ static bool pci_piix_init_ports(PCIIDEState *d, Error **errp)
{0x1f0, 0x3f6, 14}, {0x1f0, 0x3f6, 14},
{0x170, 0x376, 15}, {0x170, 0x376, 15},
}; };
int i, ret; int ret;
for (i = 0; i < 2; i++) {
ide_bus_init(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); ide_bus_init(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2);
ret = ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase, ret = ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase,
port_info[i].iobase2); port_info[i].iobase2);
@ -142,13 +141,11 @@ static bool pci_piix_init_ports(PCIIDEState *d, Error **errp)
object_get_typename(OBJECT(d)), i); object_get_typename(OBJECT(d)), i);
return false; return false;
} }
ide_bus_init_output_irq(&d->bus[i], ide_bus_init_output_irq(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq));
isa_get_irq(NULL, port_info[i].isairq));
bmdma_init(&d->bus[i], &d->bmdma[i], d); bmdma_init(&d->bus[i], &d->bmdma[i], d);
d->bmdma[i].bus = &d->bus[i]; d->bmdma[i].bus = &d->bus[i];
ide_bus_register_restart_cb(&d->bus[i]); ide_bus_register_restart_cb(&d->bus[i]);
}
return true; return true;
} }
@ -165,10 +162,12 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp)
vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d); vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d);
if (!pci_piix_init_ports(d, errp)) { for (unsigned i = 0; i < 2; i++) {
if (!pci_piix_init_bus(d, i, errp)) {
return; return;
} }
} }
}
static void pci_piix_ide_exitfn(PCIDevice *dev) static void pci_piix_ide_exitfn(PCIDevice *dev)
{ {