From patchwork Mon Aug 10 19:06:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31101 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 8AB02B6EDF for ; Tue, 11 Aug 2009 05:16:31 +1000 (EST) Received: from localhost ([127.0.0.1]:47177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MaaM7-0004vy-2u for incoming@patchwork.ozlabs.org; Mon, 10 Aug 2009 15:16:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MaaEZ-0001yI-HY for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:08:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MaaEV-0001wG-Tr for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:08:39 -0400 Received: from [199.232.76.173] (port=35404 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MaaEV-0001w9-LT for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:08:35 -0400 Received: from mx2.redhat.com ([66.187.237.31]:37723) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MaaEU-0008DS-Rk for qemu-devel@nongnu.org; Mon, 10 Aug 2009 15:08:35 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7AJ8XYt008086 for ; Mon, 10 Aug 2009 15:08:34 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7AJ8WGA010038; Mon, 10 Aug 2009 15:08:33 -0400 Received: from localhost.localdomain (vpn-12-132.rdu.redhat.com [10.11.12.132]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7AJ8SLb031266; Mon, 10 Aug 2009 15:08:31 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 10 Aug 2009 21:06:23 +0200 Message-Id: <4b923762fce52c8fecbbcbdb2c04691559406be3.1249929857.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH 3/3] Make pc speaker be configured the same way that the rest of the cards 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 Signed-off-by: Juan Quintela --- Makefile.target | 5 +++-- configure | 7 +++++++ vl.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.target b/Makefile.target index 49ba08d..0b58c94 100644 --- a/Makefile.target +++ b/Makefile.target @@ -288,6 +288,7 @@ sound-obj-$(CONFIG_AC97) += ac97.o sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o sound-obj-$(CONFIG_CS4231A) += cs4231a.o +sound-obj-$(CONFIG_PCSPK) += pcspk.o ifdef CONFIG_ADLIB adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 @@ -328,7 +329,7 @@ obj-y += wdt_ib700.o wdt_i6300esb.o # Hardware support obj-i386-y = ide.o pckbd.o vga.o $(sound-obj-y) dma.o -obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o +obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o @@ -366,7 +367,7 @@ obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o obj-mips-y += g364fb.o jazz_led.o dp8393x.o obj-mips-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o -obj-mips-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y) +obj-mips-y += piix_pci.o parallel.o cirrus_vga.o $(sound-obj-y) obj-mips-y += mipsnet.o obj-mips-y += pflash_cfi01.o obj-mips-y += vmware_vga.o diff --git a/configure b/configure index 6679919..56a0dc8 100755 --- a/configure +++ b/configure @@ -2091,6 +2091,13 @@ for card in $audio_card_list; do def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'` echo "$def=y" >> $config_mak done + +# MIPS and x86 always need pcspk compiled in, because +# they used it with a port, not only as "sound card" +case "$TARGET_BASE_ARCH" in +i386|mips) + echo "CONFIG_PCSPK" >> $config_mak +esac fi if test "$ldflags" != "" ; then diff --git a/vl.c b/vl.c index e399f0f..abb9af1 100644 --- a/vl.c +++ b/vl.c @@ -4403,7 +4403,7 @@ static const QEMUOption qemu_options[] = { #ifdef HAS_AUDIO struct soundhw soundhw[] = { #ifdef HAS_AUDIO_CHOICE -#if defined(TARGET_I386) || defined(TARGET_MIPS) +#if CONFIG_PCSPK { .name = "pcspk", .descr = "PC speaker",