mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
macio: Split MacIO in two
Let the machines create two different types. This prepares to move knowledge about sub-devices from the machines into the devices. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
7b925079e3
commit
d037834a9d
4 changed files with 82 additions and 33 deletions
|
@ -147,6 +147,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
|
|||
hwaddr kernel_base, initrd_base, cmdline_base = 0;
|
||||
long kernel_size, initrd_size;
|
||||
PCIBus *pci_bus;
|
||||
PCIDevice *macio;
|
||||
MacIONVRAMState *nvr;
|
||||
int bios_size;
|
||||
MemoryRegion *pic_mem, *dbdma_mem, *cuda_mem, *escc_mem;
|
||||
|
@ -374,7 +375,8 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
|
|||
adb_kbd_init(&adb_bus);
|
||||
adb_mouse_init(&adb_bus);
|
||||
|
||||
macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem,
|
||||
macio = pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO);
|
||||
macio_init(macio, pic_mem,
|
||||
dbdma_mem, cuda_mem, NULL, 3, ide_mem, escc_bar);
|
||||
|
||||
if (usb_enabled(machine_arch == ARCH_MAC99_U3)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue