提交 72f1f97d 编写于 作者: A Alexander Graf 提交者: David Gibson

PPC: mac99: Always add USB controller

The mac99 machines always have a USB controller. Usually not having one around
doesn't hurt quite as much, but Mac OS 9 really really wants one or it crashes
on bootup.

So always add OHCI to make it happy.
Signed-off-by: NAlexander Graf <agraf@suse.de>
Signed-off-by: NMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: NDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
上级 488661ee
...@@ -371,12 +371,13 @@ static void ppc_core99_init(MachineState *machine) ...@@ -371,12 +371,13 @@ static void ppc_core99_init(MachineState *machine)
/* 970 gets a U3 bus */ /* 970 gets a U3 bus */
pci_bus = pci_pmac_u3_init(pic, get_system_memory(), get_system_io()); pci_bus = pci_pmac_u3_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99_U3; machine_arch = ARCH_MAC99_U3;
machine->usb |= defaults_enabled() && !machine->usb_disabled;
} else { } else {
pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io()); pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99; machine_arch = ARCH_MAC99;
} }
machine->usb |= defaults_enabled() && !machine->usb_disabled;
/* Timebase Frequency */ /* Timebase Frequency */
if (kvm_enabled()) { if (kvm_enabled()) {
tbfreq = kvmppc_get_tbfreq(); tbfreq = kvmppc_get_tbfreq();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册