From patchwork Tue Jan 12 11:58:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 42714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5833EB7C4E for ; Tue, 12 Jan 2010 23:27:33 +1100 (EST) Received: from localhost ([127.0.0.1]:50991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUfof-0006dZ-O5 for incoming@patchwork.ozlabs.org; Tue, 12 Jan 2010 07:25:45 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUfOr-0005SE-6C for qemu-devel@nongnu.org; Tue, 12 Jan 2010 06:59:05 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUfOj-0005Mh-P5 for qemu-devel@nongnu.org; Tue, 12 Jan 2010 06:59:02 -0500 Received: from [199.232.76.173] (port=52117 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUfOi-0005M7-UV for qemu-devel@nongnu.org; Tue, 12 Jan 2010 06:58:57 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58130 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUfOi-0003wq-6B for qemu-devel@nongnu.org; Tue, 12 Jan 2010 06:58:56 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id AE7D787D82; Tue, 12 Jan 2010 12:58:54 +0100 (CET) From: Alexander Graf To: QEMU Developers Date: Tue, 12 Jan 2010 12:58:46 +0100 Message-Id: <1263297526-13518-10-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1263297526-13518-1-git-send-email-agraf@suse.de> References: <1263297526-13518-1-git-send-email-agraf@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH 9/9] PPC: Add USB per default on U3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 c08211e..52a56e4 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -41,6 +41,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 @@ -353,12 +354,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); @@ -367,6 +370,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;