diff options
| author | Bandan Das <bsd@redhat.com> | 2013-09-07 00:54:00 -0400 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-24 10:29:34 +0200 |
| commit | 19b0dfc19c0d911c322a03899806c59bc2f593c9 (patch) | |
| tree | b94ae2faecf645fd973fa92111168ac4493c2a45 /hw/audio | |
| parent | 2690e61e8e313461428334586ed9dbf56531dae9 (diff) | |
| download | qemu-19b0dfc19c0d911c322a03899806c59bc2f593c9.tar.gz | |
audio: remove CONFIG_MIXEMU configure option
Signed-off-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/audio')
| -rw-r--r-- | hw/audio/hda-codec.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 19a8a0e001..07a43bfe89 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -118,11 +118,9 @@ static void hda_codec_parse_fmt(uint32_t format, struct audsettings *as) #define QEMU_HDA_AMP_NONE (0) #define QEMU_HDA_AMP_STEPS 0x4a -#ifdef CONFIG_MIXEMU #define PARAM mixemu #define HDA_MIXER #include "hda-codec-common.h" -#endif #define PARAM nomixemu #include "hda-codec-common.h" @@ -594,11 +592,7 @@ static const VMStateDescription vmstate_hda_audio = { static Property hda_audio_properties[] = { DEFINE_PROP_UINT32("debug", HDAAudioState, debug, 0), -#ifdef CONFIG_MIXEMU DEFINE_PROP_BOOL("mixer", HDAAudioState, mixer, true), -#else - DEFINE_PROP_BOOL("mixer", HDAAudioState, mixer, false), -#endif DEFINE_PROP_END_OF_LIST(), }; @@ -609,15 +603,7 @@ static int hda_audio_init_output(HDACodecDevice *hda) if (!a->mixer) { return hda_audio_init(hda, &output_nomixemu); } else { - -#ifdef CONFIG_MIXEMU return hda_audio_init(hda, &output_mixemu); -#else - fprintf(stderr, "ERROR: " - "hda-codec : Mixer emulation has not been compiled in!\n"); - return -1; -#endif - } } @@ -628,15 +614,7 @@ static int hda_audio_init_duplex(HDACodecDevice *hda) if (!a->mixer) { return hda_audio_init(hda, &duplex_nomixemu); } else { - -#ifdef CONFIG_MIXEMU return hda_audio_init(hda, &duplex_mixemu); -#else - fprintf(stderr, "ERROR: " - "hda-codec : Mixer emulation has not been compiled in!\n"); - return -1; -#endif - } } @@ -647,15 +625,7 @@ static int hda_audio_init_micro(HDACodecDevice *hda) if (!a->mixer) { return hda_audio_init(hda, µ_nomixemu); } else { - -#ifdef CONFIG_MIXEMU return hda_audio_init(hda, µ_mixemu); -#else - fprintf(stderr, "ERROR: " - "hda-codec : Mixer emulation has not been compiled in!\n"); - return -1; -#endif - } } |