system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-11-05 20:35:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

audio: replace audio card configuration with default-configs

Browse source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1366303444-24620-6-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-04-18 18:44:01 +02:00 committed by Anthony Liguori
parent f6547f07d4
commit 98af93fde2
12 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure vendored
View file

@ -123,8 +123,6 @@ interp_prefix="/usr/gnemul/qemu-%M"
static="no" static="no"
cross_prefix="" cross_prefix=""
audio_drv_list="" audio_drv_list=""
audio_card_list="ac97 es1370 sb16 hda"
audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus hda"
block_drv_whitelist="" block_drv_whitelist=""
host_cc="cc" host_cc="cc"
libs_softmmu="" libs_softmmu=""
@ -704,8 +702,6 @@ for opt do
;; ;;
--oss-lib=*) oss_lib="$optarg" --oss-lib=*) oss_lib="$optarg"
;; ;;
--audio-card-list=*) audio_card_list=`echo "$optarg" | sed -e 's/,/ /g'`
;;
--audio-drv-list=*) audio_drv_list="$optarg" --audio-drv-list=*) audio_drv_list="$optarg"
;; ;;
--block-drv-whitelist=*) block_drv_whitelist=`echo "$optarg" | sed -e 's/,/ /g'` --block-drv-whitelist=*) block_drv_whitelist=`echo "$optarg" | sed -e 's/,/ /g'`
@ -1105,8 +1101,6 @@ echo " --disable-cocoa disable Cocoa (Mac OS X only)"
echo " --enable-cocoa enable Cocoa (default on Mac OS X)" echo " --enable-cocoa enable Cocoa (default on Mac OS X)"
echo " --audio-drv-list=LIST set audio drivers list:" echo " --audio-drv-list=LIST set audio drivers list:"
echo " Available drivers: $audio_possible_drivers" echo " Available drivers: $audio_possible_drivers"
echo " --audio-card-list=LIST set list of emulated audio cards [$audio_card_list]"
echo " Available cards: $audio_possible_cards"
echo " --block-drv-whitelist=L set block driver whitelist" echo " --block-drv-whitelist=L set block driver whitelist"
echo " (affects only QEMU, not qemu-img)" echo " (affects only QEMU, not qemu-img)"
echo " --enable-mixemu enable mixer emulation" echo " --enable-mixemu enable mixer emulation"
@ -3513,7 +3507,6 @@ echo "curses support $curses"
echo "curl support $curl" echo "curl support $curl"
echo "mingw32 support $mingw32" echo "mingw32 support $mingw32"
echo "Audio drivers $audio_drv_list" echo "Audio drivers $audio_drv_list"
echo "Extra audio cards $audio_card_list"
echo "Block whitelist $block_drv_whitelist" echo "Block whitelist $block_drv_whitelist"
echo "Mixer emulation $mixemu" echo "Mixer emulation $mixemu"
echo "VirtFS support $virtfs" echo "VirtFS support $virtfs"

2
default-configs/i386-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for i386-softmmu # Default configuration for i386-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_VGA=y CONFIG_VGA=y
CONFIG_QXL=$(CONFIG_SPICE) CONFIG_QXL=$(CONFIG_SPICE)
@ -22,7 +23,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y CONFIG_PIIX_PCI=y
CONFIG_SOUND=y
CONFIG_HPET=y CONFIG_HPET=y
CONFIG_APPLESMC=y CONFIG_APPLESMC=y
CONFIG_I8259=y CONFIG_I8259=y

2
default-configs/mips-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for mips-softmmu # Default configuration for mips-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
@ -23,7 +24,6 @@ CONFIG_PIIX4=y
CONFIG_IDE_ISA=y CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

2
default-configs/mips64-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for mips64-softmmu # Default configuration for mips64-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
@ -23,7 +24,6 @@ CONFIG_PIIX4=y
CONFIG_IDE_ISA=y CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

2
default-configs/mips64el-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for mips64el-softmmu # Default configuration for mips64el-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
@ -24,7 +25,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_IDE_VIA=y CONFIG_IDE_VIA=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

2
default-configs/mipsel-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for mipsel-softmmu # Default configuration for mipsel-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
CONFIG_ESP=y CONFIG_ESP=y
@ -23,7 +24,6 @@ CONFIG_PIIX4=y
CONFIG_IDE_ISA=y CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_RC4030=y CONFIG_RC4030=y
CONFIG_DP8393X=y CONFIG_DP8393X=y
CONFIG_DS1225Y=y CONFIG_DS1225Y=y

2
default-configs/ppc-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for ppc-softmmu # Default configuration for ppc-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
@ -34,7 +35,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y CONFIG_IDE_MACIO=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y CONFIG_PTIMER=y

2
default-configs/ppc64-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for ppc64-softmmu # Default configuration for ppc64-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
@ -34,7 +35,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y CONFIG_IDE_MACIO=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y CONFIG_PTIMER=y

2
default-configs/ppcemb-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for ppcemb-softmmu # Default configuration for ppcemb-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_GDBSTUB_XML=y CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y CONFIG_ISA_MMIO=y
@ -29,7 +30,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y CONFIG_IDE_MACIO=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_SOUND=y
CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y CONFIG_PTIMER=y

7
default-configs/sound.mak Normal file
View file

@ -0,0 +1,7 @@
CONFIG_SB16=y
CONFIG_AC97=y
CONFIG_HDA=y
CONFIG_ES1370=y
#CONFIG_ADLIB=y
#CONFIG_GUS=y
#CONFIG_CS4231A=y

2
default-configs/x86_64-softmmu.mak
View file

@ -1,6 +1,7 @@
# Default configuration for x86_64-softmmu # Default configuration for x86_64-softmmu
include pci.mak include pci.mak
include sound.mak
include usb.mak include usb.mak
CONFIG_VGA=y CONFIG_VGA=y
CONFIG_QXL=$(CONFIG_SPICE) CONFIG_QXL=$(CONFIG_SPICE)
@ -22,7 +23,6 @@ CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y CONFIG_IDE_PIIX=y
CONFIG_NE2000_ISA=y CONFIG_NE2000_ISA=y
CONFIG_PIIX_PCI=y CONFIG_PIIX_PCI=y
CONFIG_SOUND=y
CONFIG_HPET=y CONFIG_HPET=y
CONFIG_APPLESMC=y CONFIG_APPLESMC=y
CONFIG_I8259=y CONFIG_I8259=y

16
hw/audio/Makefile.objs
View file

@ -1,14 +1,12 @@
# Sound # Sound
sound-obj-y = common-obj-$(CONFIG_SB16) += sb16.o
sound-obj-$(CONFIG_SB16) += sb16.o common-obj-$(CONFIG_ES1370) += es1370.o
sound-obj-$(CONFIG_ES1370) += es1370.o common-obj-$(CONFIG_AC97) += ac97.o
sound-obj-$(CONFIG_AC97) += ac97.o common-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o common-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o common-obj-$(CONFIG_CS4231A) += cs4231a.o
sound-obj-$(CONFIG_CS4231A) += cs4231a.o common-obj-$(CONFIG_HDA) += intel-hda.o hda-codec.o
sound-obj-$(CONFIG_HDA) += intel-hda.o hda-codec.o
common-obj-$(CONFIG_SOUND) += $(sound-obj-y)
common-obj-$(CONFIG_PCSPK) += pcspk.o common-obj-$(CONFIG_PCSPK) += pcspk.o
common-obj-$(CONFIG_WM8750) += wm8750.o common-obj-$(CONFIG_WM8750) += wm8750.o
common-obj-$(CONFIG_PL041) += pl041.o lm4549.o common-obj-$(CONFIG_PL041) += pl041.o lm4549.o