ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

malta: give ISA bus to ISA methods 

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hervé Poussineau 2011-12-15 22:09:58 +01:00 committed by Anthony Liguori
parent c9940edb47
commit 142e978748
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/mips_malta.c
View File

@ -942,8 +942,7 @@ void mips_malta_init (ram_addr_t ram_size,
/* Southbridge */ /* Southbridge */
ide_drive_get(hd, MAX_IDE_BUS); ide_drive_get(hd, MAX_IDE_BUS);
piix4_devfn = piix4_init(pci_bus, 80); piix4_devfn = piix4_init(pci_bus, &isa_bus, 80);
isa_bus = NULL;
/* Interrupt controller */ /* Interrupt controller */
/* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */ /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */

2
hw/pc.h
View File

@ -196,7 +196,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn,
/* piix4.c */ /* piix4.c */
extern PCIDevice *piix4_dev; extern PCIDevice *piix4_dev;
int piix4_init(PCIBus *bus, int devfn); int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
/* vga.c */ /* vga.c */
enum vga_retrace_method { enum vga_retrace_method {

3
hw/piix4.c
View File

@ -93,11 +93,12 @@ static int piix4_initfn(PCIDevice *dev)
return 0; return 0;
} }
int piix4_init(PCIBus *bus, int devfn) int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
{ {
PCIDevice *d; PCIDevice *d;
d = pci_create_simple_multifunction(bus, devfn, true, "PIIX4"); d = pci_create_simple_multifunction(bus, devfn, true, "PIIX4");
*isa_bus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&d->qdev, "isa.0"));
return d->devfn; return d->devfn;
} }