mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PPC: Add USB per default on U3

Browse Source 
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 <agraf@suse.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Alexander Graf 2010-02-09 17:37:08 +01:00 committed by Michael S. Tsirkin
parent a9ceb76d55
commit a2236d4820
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/ppc_newworld.c
View File

@ -65,6 +65,7 @@
#include "elf.h" #include "elf.h"
#include "kvm.h" #include "kvm.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "hw/usb.h"
#define MAX_IDE_BUS 2 #define MAX_IDE_BUS 2
#define VGA_BIOS_SIZE 65536 #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]); ide_mem_index[2] = pmac_ide_init(hd, pic[0x0e], dbdma, 0x1a, pic[0x02]);
/* cuda also initialize ADB */ /* cuda also initialize ADB */
if (machine_arch == ARCH_MAC99_U3) {
usb_enabled = 1;
}
cuda_init(&cuda_mem_index, pic[0x19]); cuda_init(&cuda_mem_index, pic[0x19]);
adb_kbd_init(&adb_bus); adb_kbd_init(&adb_bus);
adb_mouse_init(&adb_bus); adb_mouse_init(&adb_bus);
macio_init(pci_bus, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, 0, pic_mem_index, 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, dbdma_mem_index, cuda_mem_index, NULL, 3, ide_mem_index,
escc_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); 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) if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
graphic_depth = 15; graphic_depth = 15;