mirror of
https://github.com/qemu/qemu.git
synced 2024-12-12 13:13:51 +08:00
ppc440: Change ppc460ex_pcie_init() parameter type
Change parameter of ppc460ex_pcie_init() from env to cpu to allow further refactoring. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <1695d7cc1a9f1070ab498c078916e2389d6e9469.1688586835.git.balaton@eik.bme.hu> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
2bef5b9452
commit
339d13ce57
@ -18,6 +18,6 @@ void ppc4xx_cpr_init(CPUPPCState *env);
|
||||
void ppc4xx_sdr_init(CPUPPCState *env);
|
||||
void ppc4xx_ahb_init(CPUPPCState *env);
|
||||
void ppc4xx_dma_init(CPUPPCState *env, int dcr_base);
|
||||
void ppc460ex_pcie_init(CPUPPCState *env);
|
||||
void ppc460ex_pcie_init(PowerPCCPU *cpu);
|
||||
|
||||
#endif /* PPC440_H */
|
||||
|
@ -17,6 +17,7 @@
|
||||
#include "hw/qdev-properties.h"
|
||||
#include "hw/pci/pci.h"
|
||||
#include "sysemu/reset.h"
|
||||
#include "cpu.h"
|
||||
#include "ppc440.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
@ -1108,17 +1109,17 @@ static void ppc460ex_pcie_register_dcrs(PPC460EXPCIEState *s, CPUPPCState *env)
|
||||
&dcr_read_pcie, &dcr_write_pcie);
|
||||
}
|
||||
|
||||
void ppc460ex_pcie_init(CPUPPCState *env)
|
||||
void ppc460ex_pcie_init(PowerPCCPU *cpu)
|
||||
{
|
||||
DeviceState *dev;
|
||||
|
||||
dev = qdev_new(TYPE_PPC460EX_PCIE_HOST);
|
||||
qdev_prop_set_int32(dev, "dcrn-base", DCRN_PCIE0_BASE);
|
||||
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
||||
ppc460ex_pcie_register_dcrs(PPC460EX_PCIE_HOST(dev), env);
|
||||
ppc460ex_pcie_register_dcrs(PPC460EX_PCIE_HOST(dev), &cpu->env);
|
||||
|
||||
dev = qdev_new(TYPE_PPC460EX_PCIE_HOST);
|
||||
qdev_prop_set_int32(dev, "dcrn-base", DCRN_PCIE1_BASE);
|
||||
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
||||
ppc460ex_pcie_register_dcrs(PPC460EX_PCIE_HOST(dev), env);
|
||||
ppc460ex_pcie_register_dcrs(PPC460EX_PCIE_HOST(dev), &cpu->env);
|
||||
}
|
||||
|
@ -422,7 +422,7 @@ static void sam460ex_init(MachineState *machine)
|
||||
usb_create_simple(usb_bus_find(-1), "usb-mouse");
|
||||
|
||||
/* PCI bus */
|
||||
ppc460ex_pcie_init(env);
|
||||
ppc460ex_pcie_init(cpu);
|
||||
/* All PCI irqs are connected to the same UIC pin (cf. UBoot source) */
|
||||
dev = sysbus_create_simple("ppc440-pcix-host", 0xc0ec00000,
|
||||
qdev_get_gpio_in(uic[1], 0));
|
||||
|
Loading…
Reference in New Issue
Block a user