From patchwork Wed Sep 21 09:34:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Egger X-Patchwork-Id: 115724 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 305FCB6F8E for ; Wed, 21 Sep 2011 19:34:46 +1000 (EST) Received: from localhost ([::1]:49438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6JCR-0006iy-P4 for incoming@patchwork.ozlabs.org; Wed, 21 Sep 2011 05:34:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6JCD-0006ir-GQ for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6JCA-0004Pl-CT for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:34:25 -0400 Received: from am1ehsobe003.messaging.microsoft.com ([213.199.154.206]:15981 helo=AM1EHSOBE003.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6JC9-0004Pf-LR for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:34:22 -0400 Received: from mail46-am1-R.bigfish.com (10.3.201.243) by AM1EHSOBE003.bigfish.com (10.3.204.23) with Microsoft SMTP Server id 14.1.225.22; Wed, 21 Sep 2011 09:34:20 +0000 Received: from mail46-am1 (localhost.localdomain [127.0.0.1]) by mail46-am1-R.bigfish.com (Postfix) with ESMTP id 3DDA02182B9 for ; Wed, 21 Sep 2011 09:34:20 +0000 (UTC) X-SpamScore: 1 X-BigFish: VPS1(zzc85dhzz1202hzz8275bh8275dhz32i668h839h34h62h) X-Forefront-Antispam-Report: CIP:163.181.249.109; KIP:(null); UIP:(null); IPVD:NLI; H:ausb3twp02.amd.com; RD:none; EFVD:NLI X-FB-SS: 0,0, Received: from mail46-am1 (localhost.localdomain [127.0.0.1]) by mail46-am1 (MessageSwitch) id 1316597659655992_1636; Wed, 21 Sep 2011 09:34:19 +0000 (UTC) Received: from AM1EHSMHS013.bigfish.com (unknown [10.3.201.241]) by mail46-am1.bigfish.com (Postfix) with ESMTP id 92418F6005B for ; Wed, 21 Sep 2011 09:34:19 +0000 (UTC) Received: from ausb3twp02.amd.com (163.181.249.109) by AM1EHSMHS013.bigfish.com (10.3.207.151) with Microsoft SMTP Server id 14.1.225.22; Wed, 21 Sep 2011 09:34:17 +0000 X-WSS-ID: 0LRV990-02-5Y4-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp02.amd.com (Axway MailGate 3.8.1) with ESMTP id 2DE8FC82A2 for ; Wed, 21 Sep 2011 04:34:11 -0500 (CDT) Received: from sausexhtp01.amd.com (163.181.3.165) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.106.1; Wed, 21 Sep 2011 04:34:25 -0500 Received: from storexhtp02.amd.com (172.24.4.4) by sausexhtp01.amd.com (163.181.3.165) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 21 Sep 2011 04:34:14 -0500 Received: from rhodium.osrc.amd.com (165.204.15.173) by storexhtp02.amd.com (172.24.4.4) with Microsoft SMTP Server id 8.3.83.0; Wed, 21 Sep 2011 05:34:13 -0400 Message-ID: <4E79AF93.4030207@amd.com> Date: Wed, 21 Sep 2011 11:34:11 +0200 From: Christoph Egger User-Agent: Mozilla/5.0 (X11; U; NetBSD amd64; en-US; rv:1.9.2.17) Gecko/20110523 Lightning/1.0b3pre Thunderbird/3.1.10 MIME-Version: 1.0 To: "qemu-devel@nongnu.org" X-OriginatorOrg: amd.com X-detected-operating-system: by eggs.gnu.org: Windows 2000 SP2+, XP SP1+ (seldom 98) X-Received-From: 213.199.154.206 Subject: [Qemu-devel] [PATCH] fix qemu build with nas installed 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 When NAS (http://nas.sf.net) is installed then there is an existing audio/audio.h. Then when compiling qemu, #include "audio/audio.h" takes the one from NAS and causes the build to fail. So rename audio/audio.h to audio/qaudio.h and adjust all users. Signed-off-by: Christoph Egger diff --git a/arch_init.c b/arch_init.c index 9a5a0e3..516c4c0 100644 --- a/arch_init.c +++ b/arch_init.c @@ -32,7 +32,7 @@ #include "monitor.h" #include "sysemu.h" #include "arch_init.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "hw/pc.h" #include "hw/pci.h" #include "hw/audiodev.h" diff --git a/audio/audio.c b/audio/audio.c index 5649075..efbd6a0 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "hw/hw.h" -#include "audio.h" +#include "qaudio.h" #include "monitor.h" #include "qemu-timer.h" #include "sysemu.h" diff --git a/audio/audio.h b/audio/audio.h deleted file mode 100644 index a70fda9..0000000 --- a/audio/audio.h +++ /dev/null @@ -1,166 +0,0 @@ -/* - * QEMU Audio subsystem header - * - * Copyright (c) 2003-2005 Vassili Karpov (malc) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -#ifndef QEMU_AUDIO_H -#define QEMU_AUDIO_H - -#include "config-host.h" -#include "qemu-queue.h" - -typedef void (*audio_callback_fn) (void *opaque, int avail); - -typedef enum { - AUD_FMT_U8, - AUD_FMT_S8, - AUD_FMT_U16, - AUD_FMT_S16, - AUD_FMT_U32, - AUD_FMT_S32 -} audfmt_e; - -#ifdef HOST_WORDS_BIGENDIAN -#define AUDIO_HOST_ENDIANNESS 1 -#else -#define AUDIO_HOST_ENDIANNESS 0 -#endif - -struct audsettings { - int freq; - int nchannels; - audfmt_e fmt; - int endianness; -}; - -typedef enum { - AUD_CNOTIFY_ENABLE, - AUD_CNOTIFY_DISABLE -} audcnotification_e; - -struct audio_capture_ops { - void (*notify) (void *opaque, audcnotification_e cmd); - void (*capture) (void *opaque, void *buf, int size); - void (*destroy) (void *opaque); -}; - -struct capture_ops { - void (*info) (void *opaque); - void (*destroy) (void *opaque); -}; - -typedef struct CaptureState { - void *opaque; - struct capture_ops ops; - QLIST_ENTRY (CaptureState) entries; -} CaptureState; - -typedef struct SWVoiceOut SWVoiceOut; -typedef struct CaptureVoiceOut CaptureVoiceOut; -typedef struct SWVoiceIn SWVoiceIn; - -typedef struct QEMUSoundCard { - char *name; - QLIST_ENTRY (QEMUSoundCard) entries; -} QEMUSoundCard; - -typedef struct QEMUAudioTimeStamp { - uint64_t old_ts; -} QEMUAudioTimeStamp; - -void AUD_vlog (const char *cap, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); -void AUD_log (const char *cap, const char *fmt, ...) GCC_FMT_ATTR(2, 3); - -void AUD_help (void); -void AUD_register_card (const char *name, QEMUSoundCard *card); -void AUD_remove_card (QEMUSoundCard *card); -CaptureVoiceOut *AUD_add_capture ( - struct audsettings *as, - struct audio_capture_ops *ops, - void *opaque - ); -void AUD_del_capture (CaptureVoiceOut *cap, void *cb_opaque); - -SWVoiceOut *AUD_open_out ( - QEMUSoundCard *card, - SWVoiceOut *sw, - const char *name, - void *callback_opaque, - audio_callback_fn callback_fn, - struct audsettings *settings - ); - -void AUD_close_out (QEMUSoundCard *card, SWVoiceOut *sw); -int AUD_write (SWVoiceOut *sw, void *pcm_buf, int size); -int AUD_get_buffer_size_out (SWVoiceOut *sw); -void AUD_set_active_out (SWVoiceOut *sw, int on); -int AUD_is_active_out (SWVoiceOut *sw); - -void AUD_init_time_stamp_out (SWVoiceOut *sw, QEMUAudioTimeStamp *ts); -uint64_t AUD_get_elapsed_usec_out (SWVoiceOut *sw, QEMUAudioTimeStamp *ts); - -void AUD_set_volume_out (SWVoiceOut *sw, int mute, uint8_t lvol, uint8_t rvol); -void AUD_set_volume_in (SWVoiceIn *sw, int mute, uint8_t lvol, uint8_t rvol); - -SWVoiceIn *AUD_open_in ( - QEMUSoundCard *card, - SWVoiceIn *sw, - const char *name, - void *callback_opaque, - audio_callback_fn callback_fn, - struct audsettings *settings - ); - -void AUD_close_in (QEMUSoundCard *card, SWVoiceIn *sw); -int AUD_read (SWVoiceIn *sw, void *pcm_buf, int size); -void AUD_set_active_in (SWVoiceIn *sw, int on); -int AUD_is_active_in (SWVoiceIn *sw); - -void AUD_init_time_stamp_in (SWVoiceIn *sw, QEMUAudioTimeStamp *ts); -uint64_t AUD_get_elapsed_usec_in (SWVoiceIn *sw, QEMUAudioTimeStamp *ts); - -static inline void *advance (void *p, int incr) -{ - uint8_t *d = p; - return (d + incr); -} - -#ifdef __GNUC__ -#define audio_MIN(a, b) ( __extension__ ({ \ - __typeof (a) ta = a; \ - __typeof (b) tb = b; \ - ((ta)>(tb)?(tb):(ta)); \ -})) - -#define audio_MAX(a, b) ( __extension__ ({ \ - __typeof (a) ta = a; \ - __typeof (b) tb = b; \ - ((ta)<(tb)?(tb):(ta)); \ -})) -#else -#define audio_MIN(a, b) ((a)>(b)?(b):(a)) -#define audio_MAX(a, b) ((a)<(b)?(b):(a)) -#endif - -int wav_start_capture (CaptureState *s, const char *path, int freq, - int bits, int nchannels); - -#endif /* audio.h */ diff --git a/audio/mixeng.c b/audio/mixeng.c index 5446be6..7efe815 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ #include "qemu-common.h" -#include "audio.h" +#include "qaudio.h" #define AUDIO_CAP "mixeng" #include "audio_int.h" diff --git a/audio/noaudio.c b/audio/noaudio.c index 54958f8..c6ad9fb 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu-common.h" -#include "audio.h" +#include "qaudio.h" #include "qemu-timer.h" #define AUDIO_CAP "noaudio" diff --git a/audio/ossaudio.c b/audio/ossaudio.c index df51b7c..6c5bec4 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -33,7 +33,7 @@ #include "qemu-common.h" #include "host-utils.h" #include "qemu-char.h" -#include "audio.h" +#include "qaudio.h" #define AUDIO_CAP "oss" #include "audio_int.h" diff --git a/audio/qaudio.h b/audio/qaudio.h new file mode 100644 index 0000000..a70fda9 --- /dev/null +++ b/audio/qaudio.h @@ -0,0 +1,166 @@ +/* + * QEMU Audio subsystem header + * + * Copyright (c) 2003-2005 Vassili Karpov (malc) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#ifndef QEMU_AUDIO_H +#define QEMU_AUDIO_H + +#include "config-host.h" +#include "qemu-queue.h" + +typedef void (*audio_callback_fn) (void *opaque, int avail); + +typedef enum { + AUD_FMT_U8, + AUD_FMT_S8, + AUD_FMT_U16, + AUD_FMT_S16, + AUD_FMT_U32, + AUD_FMT_S32 +} audfmt_e; + +#ifdef HOST_WORDS_BIGENDIAN +#define AUDIO_HOST_ENDIANNESS 1 +#else +#define AUDIO_HOST_ENDIANNESS 0 +#endif + +struct audsettings { + int freq; + int nchannels; + audfmt_e fmt; + int endianness; +}; + +typedef enum { + AUD_CNOTIFY_ENABLE, + AUD_CNOTIFY_DISABLE +} audcnotification_e; + +struct audio_capture_ops { + void (*notify) (void *opaque, audcnotification_e cmd); + void (*capture) (void *opaque, void *buf, int size); + void (*destroy) (void *opaque); +}; + +struct capture_ops { + void (*info) (void *opaque); + void (*destroy) (void *opaque); +}; + +typedef struct CaptureState { + void *opaque; + struct capture_ops ops; + QLIST_ENTRY (CaptureState) entries; +} CaptureState; + +typedef struct SWVoiceOut SWVoiceOut; +typedef struct CaptureVoiceOut CaptureVoiceOut; +typedef struct SWVoiceIn SWVoiceIn; + +typedef struct QEMUSoundCard { + char *name; + QLIST_ENTRY (QEMUSoundCard) entries; +} QEMUSoundCard; + +typedef struct QEMUAudioTimeStamp { + uint64_t old_ts; +} QEMUAudioTimeStamp; + +void AUD_vlog (const char *cap, const char *fmt, va_list ap) GCC_FMT_ATTR(2, 0); +void AUD_log (const char *cap, const char *fmt, ...) GCC_FMT_ATTR(2, 3); + +void AUD_help (void); +void AUD_register_card (const char *name, QEMUSoundCard *card); +void AUD_remove_card (QEMUSoundCard *card); +CaptureVoiceOut *AUD_add_capture ( + struct audsettings *as, + struct audio_capture_ops *ops, + void *opaque + ); +void AUD_del_capture (CaptureVoiceOut *cap, void *cb_opaque); + +SWVoiceOut *AUD_open_out ( + QEMUSoundCard *card, + SWVoiceOut *sw, + const char *name, + void *callback_opaque, + audio_callback_fn callback_fn, + struct audsettings *settings + ); + +void AUD_close_out (QEMUSoundCard *card, SWVoiceOut *sw); +int AUD_write (SWVoiceOut *sw, void *pcm_buf, int size); +int AUD_get_buffer_size_out (SWVoiceOut *sw); +void AUD_set_active_out (SWVoiceOut *sw, int on); +int AUD_is_active_out (SWVoiceOut *sw); + +void AUD_init_time_stamp_out (SWVoiceOut *sw, QEMUAudioTimeStamp *ts); +uint64_t AUD_get_elapsed_usec_out (SWVoiceOut *sw, QEMUAudioTimeStamp *ts); + +void AUD_set_volume_out (SWVoiceOut *sw, int mute, uint8_t lvol, uint8_t rvol); +void AUD_set_volume_in (SWVoiceIn *sw, int mute, uint8_t lvol, uint8_t rvol); + +SWVoiceIn *AUD_open_in ( + QEMUSoundCard *card, + SWVoiceIn *sw, + const char *name, + void *callback_opaque, + audio_callback_fn callback_fn, + struct audsettings *settings + ); + +void AUD_close_in (QEMUSoundCard *card, SWVoiceIn *sw); +int AUD_read (SWVoiceIn *sw, void *pcm_buf, int size); +void AUD_set_active_in (SWVoiceIn *sw, int on); +int AUD_is_active_in (SWVoiceIn *sw); + +void AUD_init_time_stamp_in (SWVoiceIn *sw, QEMUAudioTimeStamp *ts); +uint64_t AUD_get_elapsed_usec_in (SWVoiceIn *sw, QEMUAudioTimeStamp *ts); + +static inline void *advance (void *p, int incr) +{ + uint8_t *d = p; + return (d + incr); +} + +#ifdef __GNUC__ +#define audio_MIN(a, b) ( __extension__ ({ \ + __typeof (a) ta = a; \ + __typeof (b) tb = b; \ + ((ta)>(tb)?(tb):(ta)); \ +})) + +#define audio_MAX(a, b) ( __extension__ ({ \ + __typeof (a) ta = a; \ + __typeof (b) tb = b; \ + ((ta)<(tb)?(tb):(ta)); \ +})) +#else +#define audio_MIN(a, b) ((a)>(b)?(b):(a)) +#define audio_MAX(a, b) ((a)<(b)?(b):(a)) +#endif + +int wav_start_capture (CaptureState *s, const char *path, int freq, + int bits, int nchannels); + +#endif /* audio.h */ diff --git a/audio/wavaudio.c b/audio/wavaudio.c index aed1817..d8673cb 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -23,7 +23,7 @@ */ #include "hw/hw.h" #include "qemu-timer.h" -#include "audio.h" +#include "qaudio.h" #define AUDIO_CAP "wav" #include "audio_int.h" diff --git a/audio/wavcapture.c b/audio/wavcapture.c index c64f0ef..28434c3 100644 --- a/audio/wavcapture.c +++ b/audio/wavcapture.c @@ -1,6 +1,6 @@ #include "hw/hw.h" #include "monitor.h" -#include "audio.h" +#include "qaudio.h" typedef struct { QEMUFile *f; diff --git a/hw/ac97.c b/hw/ac97.c index 541d9a4..f4adfcd 100644 --- a/hw/ac97.c +++ b/hw/ac97.c @@ -16,7 +16,7 @@ #include "hw.h" #include "audiodev.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "pci.h" enum { diff --git a/hw/es1370.c b/hw/es1370.c index a9387d1..553f921 100644 --- a/hw/es1370.c +++ b/hw/es1370.c @@ -28,7 +28,7 @@ #include "hw.h" #include "audiodev.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "pci.h" /* Missing stuff: diff --git a/hw/hda-audio.c b/hw/hda-audio.c index c699d6f..1bd849f 100644 --- a/hw/hda-audio.c +++ b/hw/hda-audio.c @@ -21,7 +21,7 @@ #include "pci.h" #include "intel-hda.h" #include "intel-hda-defs.h" -#include "audio/audio.h" +#include "audio/qaudio.h" /* -------------------------------------------------------------------------- */ diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c index f8c5242..89db43c 100644 --- a/hw/marvell_88w8618_audio.c +++ b/hw/marvell_88w8618_audio.c @@ -10,7 +10,7 @@ #include "hw.h" #include "i2c.h" #include "sysbus.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #define MP_AUDIO_SIZE 0x00001000 diff --git a/hw/milkymist-ac97.c b/hw/milkymist-ac97.c index 6104732..bb041bd 100644 --- a/hw/milkymist-ac97.c +++ b/hw/milkymist-ac97.c @@ -24,7 +24,7 @@ #include "hw.h" #include "sysbus.h" #include "trace.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "qemu-error.h" enum { diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index abe3056..99c0f42 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -29,7 +29,7 @@ #include "usb-uhci.h" #include "qemu-char.h" #include "sysemu.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "qemu-log.h" #include "loader.h" #include "mips-bios.h" diff --git a/hw/omap2.c b/hw/omap2.c index ca088d9..6d37da1 100644 --- a/hw/omap2.c +++ b/hw/omap2.c @@ -28,7 +28,7 @@ #include "flash.h" #include "soc_dma.h" #include "sysbus.h" -#include "audio/audio.h" +#include "audio/qaudio.h" /* Enhanced Audio Controller (CODEC only) */ struct omap_eac_s { diff --git a/hw/palm.c b/hw/palm.c index 4c67e75..60bf998 100644 --- a/hw/palm.c +++ b/hw/palm.c @@ -17,7 +17,7 @@ * with this program; if not, see . */ #include "hw.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "sysemu.h" #include "console.h" #include "omap.h" diff --git a/hw/pcspk.c b/hw/pcspk.c index 7fa2d36..343466e 100644 --- a/hw/pcspk.c +++ b/hw/pcspk.c @@ -25,7 +25,7 @@ #include "hw.h" #include "pc.h" #include "isa.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "qemu-timer.h" #define PCSPK_BUF_LEN 1792 diff --git a/hw/sb16.c b/hw/sb16.c index a76df1b..e9694ab 100644 --- a/hw/sb16.c +++ b/hw/sb16.c @@ -23,7 +23,7 @@ */ #include "hw.h" #include "audiodev.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "isa.h" #include "qdev.h" #include "qemu-timer.h" diff --git a/hw/spitz.c b/hw/spitz.c index 0adae59..99126d6 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -20,7 +20,7 @@ #include "sharpsl.h" #include "console.h" #include "block.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "boards.h" #include "blockdev.h" #include "sysbus.h" diff --git a/hw/tsc210x.c b/hw/tsc210x.c index 3c448a6..d1708c4 100644 --- a/hw/tsc210x.c +++ b/hw/tsc210x.c @@ -20,7 +20,7 @@ */ #include "hw.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "qemu-timer.h" #include "console.h" #include "omap.h" /* For I2SCodec and uWireSlave */ diff --git a/hw/wm8750.c b/hw/wm8750.c index 39383f4..035ffde 100644 --- a/hw/wm8750.c +++ b/hw/wm8750.c @@ -9,7 +9,7 @@ #include "hw.h" #include "i2c.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #define IN_PORT_N 3 #define OUT_PORT_N 3 diff --git a/hw/z2.c b/hw/z2.c index b6ae608..f08dbef 100644 --- a/hw/z2.c +++ b/hw/z2.c @@ -19,7 +19,7 @@ #include "flash.h" #include "blockdev.h" #include "console.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #ifdef DEBUG_Z2 #define DPRINTF(fmt, ...) \ diff --git a/monitor.c b/monitor.c index 03ae997..d111685 100644 --- a/monitor.c +++ b/monitor.c @@ -40,7 +40,7 @@ #include "readline.h" #include "console.h" #include "blockdev.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "disas.h" #include "balloon.h" #include "qemu-timer.h" diff --git a/ui/vnc.h b/ui/vnc.h index 66689f1..a60196c 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -34,7 +34,7 @@ #endif #include "console.h" #include "monitor.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "bitmap.h" #include #include diff --git a/vl.c b/vl.c index b773d2f..9967ff9 100644 --- a/vl.c +++ b/vl.c @@ -140,7 +140,7 @@ int main(int argc, char **argv) #include "blockdev.h" #include "block-migration.h" #include "dma.h" -#include "audio/audio.h" +#include "audio/qaudio.h" #include "migration.h" #include "kvm.h" #include "qemu-option.h"