[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/10] PPC: Add USB per default on U3
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 08/10] PPC: Add USB per default on U3 |
Date: |
Tue, 9 Feb 2010 17:37:08 +0100 |
Linux with CONFIG_PPC64 doesn't support ADB devices anymore, so we have to
use USB for keyboard and mouse.
This patch enables USB per default on U3 and adds a virtual keyboard and mouse
there.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/ppc_newworld.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index dafd37c..bc86c85 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -65,6 +65,7 @@
#include "elf.h"
#include "kvm.h"
#include "kvm_ppc.h"
+#include "hw/usb.h"
#define MAX_IDE_BUS 2
#define VGA_BIOS_SIZE 65536
@@ -377,12 +378,14 @@ static void ppc_core99_init (ram_addr_t ram_size,
ide_mem_index[2] = pmac_ide_init(hd, pic[0x0e], dbdma, 0x1a, pic[0x02]);
/* cuda also initialize ADB */
+ if (machine_arch == ARCH_MAC99_U3) {
+ usb_enabled = 1;
+ }
cuda_init(&cuda_mem_index, pic[0x19]);
adb_kbd_init(&adb_bus);
adb_mouse_init(&adb_bus);
-
macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem_index,
dbdma_mem_index, cuda_mem_index, NULL, 3, ide_mem_index,
escc_mem_index);
@@ -391,6 +394,13 @@ static void ppc_core99_init (ram_addr_t ram_size,
usb_ohci_init_pci(pci_bus, -1);
}
+ /* U3 needs to use USB for input because Linux doesn't support via-cuda
+ on PPC64 */
+ if (machine_arch == ARCH_MAC99_U3) {
+ usbdevice_create("keyboard");
+ usbdevice_create("mouse");
+ }
+
if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
graphic_depth = 15;
--
1.6.0.2
- [Qemu-devel] [PATCH 00/10] PPC NewWorld fixery v4, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 06/10] PPC: Use macio IDE controller for Newworld, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 08/10] PPC: Add USB per default on U3,
Alexander Graf <=
- [Qemu-devel] [PATCH 04/10] PPC: Make interrupts work, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 03/10] PPC: Include dump of lspci -nn on real G5, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 07/10] PPC: Get rid of segfaults in DBDMA emulation, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 10/10] PPC: Add timer when running KVM, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 09/10] PPC: Fix large pages, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 01/10] PPC: Uninorth config space accessor, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 05/10] PPC: tell the guest about the time base frequency, Alexander Graf, 2010/02/09
- [Qemu-devel] [PATCH 02/10] PPC: Use Mac99_U3 type on ppc64, Alexander Graf, 2010/02/09
- [Qemu-devel] Re: [PATCH 00/10] PPC NewWorld fixery v4, Michael S. Tsirkin, 2010/02/09