From patchwork Tue Jun 14 02:37:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 100275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F0102B6FAB for ; Tue, 14 Jun 2011 15:10:17 +1000 (EST) Received: from localhost ([::1]:40114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWLtF-00038U-OC for incoming@patchwork.ozlabs.org; Tue, 14 Jun 2011 01:10:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJWB-0006w0-KG for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWJW8-0006kT-RL for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:15 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:51390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJW7-0006jj-3w for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:11 -0400 Received: from smtp03.web.de ( [172.20.0.65]) by fmmailgate01.web.de (Postfix) with ESMTP id 77D701918685E; Tue, 14 Jun 2011 04:38:10 +0200 (CEST) Received: from [87.173.124.240] (helo=af.local) by smtp03.web.de with asmtp (WEB.DE 4.110 #2) id 1QWJW6-0000Aw-00; Tue, 14 Jun 2011 04:38:10 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 14 Jun 2011 04:37:55 +0200 Message-Id: <1308019077-61957-22-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 In-Reply-To: <1308019077-61957-21-git-send-email-andreas.faerber@web.de> References: <1308019077-61957-1-git-send-email-andreas.faerber@web.de> <1308019077-61957-2-git-send-email-andreas.faerber@web.de> <1308019077-61957-3-git-send-email-andreas.faerber@web.de> <1308019077-61957-4-git-send-email-andreas.faerber@web.de> <1308019077-61957-5-git-send-email-andreas.faerber@web.de> <1308019077-61957-6-git-send-email-andreas.faerber@web.de> <1308019077-61957-7-git-send-email-andreas.faerber@web.de> <1308019077-61957-8-git-send-email-andreas.faerber@web.de> <1308019077-61957-9-git-send-email-andreas.faerber@web.de> <1308019077-61957-10-git-send-email-andreas.faerber@web.de> <1308019077-61957-11-git-send-email-andreas.faerber@web.de> <1308019077-61957-12-git-send-email-andreas.faerber@web.de> <1308019077-61957-13-git-send-email-andreas.faerber@web.de> <1308019077-61957-14-git-send-email-andreas.faerber@web.de> <1308019077-61957-15-git-send-email-andreas.faerber@web.de> <1308019077-61957-16-git-send-email-andreas.faerber@web.de> <1308019077-61957-17-git-send-email-andreas.faerber@web.de> <1308019077-61957-18-git-send-email-andreas.faerber@web.de> <1308019077-61957-19-git-send-email-andreas.faerber@web.de> <1308019077-61957-20-git-send-email-andreas.faerber@web.de> <1308019077-61957-21-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1+qV8aQHAYpizetkw/mOahsAOS3CJax94Md2K4e M1PMq5STXJpYOs+FFOVgmvEDbLIY4bFCp4eC2dlQBLATr8GMTZ FJboN5ZChY2UwDz4g4nw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.221 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [RFC 21/23] 40p: Add an audio card and a keyboard X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Hervé Poussineau Signed-off-by: Hervé Poussineau Signed-off-by: Andreas Färber --- default-configs/ppc-softmmu.mak | 1 + hw/ppc_prep.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 0999008..303929f 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -19,6 +19,7 @@ CONFIG_I82378=y CONFIG_PC87312=y CONFIG_MACIO=y CONFIG_PCSPK=y +CONFIG_CS4231A=y CONFIG_CUDA=y CONFIG_ADB=y CONFIG_MAC_NVRAM=y diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 935d1e9..4759a03 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -848,6 +848,14 @@ static void ibm_40p_init(ram_addr_t ram_size, qdev_prop_set(&isa->qdev, "floppyB", drive->bdrv, PROP_TYPE_DRIVE); } qdev_init_nofail(&isa->qdev); + + /* Audio */ + isa = isa_create("cs4231a"); + qdev_prop_set_uint32(&isa->qdev, "iobase", 0x830); + qdev_prop_set_uint32(&isa->qdev, "irq", 10); + qdev_init_nofail(&isa->qdev); + + isa_create_simple("i8042"); } static QEMUMachine prep_machine = {