[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 03/14] PPC: mac99: Always add USB controller
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 03/14] PPC: mac99: Always add USB controller |
Date: |
Thu, 12 Nov 2015 15:38:32 +1100 |
From: Alexander Graf <address@hidden>
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: Alexander Graf <address@hidden>
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/mac_newworld.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 66d016c..1b9a573 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -371,12 +371,13 @@ static void ppc_core99_init(MachineState *machine)
/* 970 gets a U3 bus */
pci_bus = pci_pmac_u3_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99_U3;
- machine->usb |= defaults_enabled() && !machine->usb_disabled;
} else {
pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99;
}
+ machine->usb |= defaults_enabled() && !machine->usb_disabled;
+
/* Timebase Frequency */
if (kvm_enabled()) {
tbfreq = kvmppc_get_tbfreq();
--
2.5.0
- [Qemu-ppc] [PULL 00/14] ppc-next queue 20151112, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 01/14] PPC: Allow Rc bit to be set on mtspr, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 00/14] ppc-next queue 20151112, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 02/14] PPC: Fix lswx bounds checks, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 07/14] cuda.c: implement dummy IIC access commands, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 04/14] cuda.c: fix CUDA ADB error packet format, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 08/14] cuda.c: fix CUDA SR interrupt clearing, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 05/14] cuda.c: fix CUDA_PACKET response packet format, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 03/14] PPC: mac99: Always add USB controller,
David Gibson <=
- [Qemu-ppc] [PULL 06/14] cuda.c: implement simple CUDA_GET_6805_ADDR command, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 09/14] cuda.c: add defines for CUDA registers, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 12/14] cuda.c: fix T2 timer and enable its interrupt, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 13/14] cuda.c: add delay to setting of SR_INT bit, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 11/14] cuda.c: rename get_counter() state variable from s to ti for consistency, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 10/14] cuda.c: refactor get_tb() so that the time can be passed in, David Gibson, 2015/11/11
- [Qemu-ppc] [PULL 14/14] monitor/target-ppc: Define target_get_monitor_def, David Gibson, 2015/11/11