From patchwork Tue Aug 11 00:31:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31117 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 360DFB6F20 for ; Tue, 11 Aug 2009 10:39:38 +1000 (EST) Received: from localhost ([127.0.0.1]:40881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MafOo-00034u-UP for incoming@patchwork.ozlabs.org; Mon, 10 Aug 2009 20:39:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MafJ1-0000jF-Kw for qemu-devel@nongnu.org; Mon, 10 Aug 2009 20:33:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MafIu-0000ei-PQ for qemu-devel@nongnu.org; Mon, 10 Aug 2009 20:33:33 -0400 Received: from [199.232.76.173] (port=43317 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MafIu-0000eY-Ds for qemu-devel@nongnu.org; Mon, 10 Aug 2009 20:33:28 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53678) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MafIt-0007JO-NT for qemu-devel@nongnu.org; Mon, 10 Aug 2009 20:33:28 -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 n7B0XRPS030890 for ; Mon, 10 Aug 2009 20:33:27 -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 n7B0XQdt006613; Mon, 10 Aug 2009 20:33:26 -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 n7B0XMaE016692; Mon, 10 Aug 2009 20:33:25 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 11 Aug 2009 02:31:15 +0200 Message-Id: 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 2/4] use C99 initializers for audio_pcm_ops 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 --- audio/alsaaudio.c | 22 +++++++++++----------- audio/coreaudio.c | 16 +++++----------- audio/dsoundaudio.c | 22 +++++++++++----------- audio/esdaudio.c | 22 +++++++++++----------- audio/fmodaudio.c | 22 +++++++++++----------- audio/noaudio.c | 22 +++++++++++----------- audio/ossaudio.c | 22 +++++++++++----------- audio/paaudio.c | 21 +++++++++++---------- audio/sdlaudio.c | 16 +++++----------- audio/wavaudio.c | 16 +++++----------- 10 files changed, 92 insertions(+), 109 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 61a8cd0..71a8c89 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -969,17 +969,17 @@ static struct audio_option alsa_options[] = { }; static struct audio_pcm_ops alsa_pcm_ops = { - alsa_init_out, - alsa_fini_out, - alsa_run_out, - alsa_write, - alsa_ctl_out, - - alsa_init_in, - alsa_fini_in, - alsa_run_in, - alsa_read, - alsa_ctl_in + .init_out = alsa_init_out, + .fini_out = alsa_fini_out, + .run_out = alsa_run_out, + .write = alsa_write, + .ctl_out = alsa_ctl_out, + + .init_in = alsa_init_in, + .fini_in = alsa_fini_in, + .run_in = alsa_run_in, + .read = alsa_read, + .ctl_in = alsa_ctl_in }; struct audio_driver alsa_audio_driver = { diff --git a/audio/coreaudio.c b/audio/coreaudio.c index c46b357..9a9754d 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -521,17 +521,11 @@ static struct audio_option coreaudio_options[] = { }; static struct audio_pcm_ops coreaudio_pcm_ops = { - coreaudio_init_out, - coreaudio_fini_out, - coreaudio_run_out, - coreaudio_write, - coreaudio_ctl_out, - - NULL, - NULL, - NULL, - NULL, - NULL + .init_out = coreaudio_init_out, + .fini_out = coreaudio_fini_out, + .run_out = coreaudio_run_out, + .write = coreaudio_write, + .ctl_out = coreaudio_ctl_out }; struct audio_driver coreaudio_audio_driver = { diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index 7c08790..a8edfee 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -1059,17 +1059,17 @@ static struct audio_option dsound_options[] = { }; static struct audio_pcm_ops dsound_pcm_ops = { - dsound_init_out, - dsound_fini_out, - dsound_run_out, - dsound_write, - dsound_ctl_out, - - dsound_init_in, - dsound_fini_in, - dsound_run_in, - dsound_read, - dsound_ctl_in + .init_out = dsound_init_out, + .fini_out = dsound_fini_out, + .run_out = dsound_run_out, + .write = dsound_write, + .ctl_out = dsound_ctl_out, + + .init_in = dsound_init_in, + .fini_in = dsound_fini_in, + .run_in = dsound_run_in, + .read = dsound_read, + .ctl_in = dsound_ctl_in }; struct audio_driver dsound_audio_driver = { diff --git a/audio/esdaudio.c b/audio/esdaudio.c index ff6725e..29f4ffc 100644 --- a/audio/esdaudio.c +++ b/audio/esdaudio.c @@ -567,17 +567,17 @@ struct audio_option qesd_options[] = { }; static struct audio_pcm_ops qesd_pcm_ops = { - qesd_init_out, - qesd_fini_out, - qesd_run_out, - qesd_write, - qesd_ctl_out, - - qesd_init_in, - qesd_fini_in, - qesd_run_in, - qesd_read, - qesd_ctl_in, + .init_out = qesd_init_out, + .fini_out = qesd_fini_out, + .run_out = qesd_run_out, + .write = qesd_write, + .ctl_out = qesd_ctl_out, + + .init_in = qesd_init_in, + .fini_in = qesd_fini_in, + .run_in = qesd_run_in, + .read = qesd_read, + .ctl_in = qesd_ctl_in, }; struct audio_driver esd_audio_driver = { diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c index 8259551..83a6454 100644 --- a/audio/fmodaudio.c +++ b/audio/fmodaudio.c @@ -658,17 +658,17 @@ static struct audio_option fmod_options[] = { }; static struct audio_pcm_ops fmod_pcm_ops = { - fmod_init_out, - fmod_fini_out, - fmod_run_out, - fmod_write, - fmod_ctl_out, - - fmod_init_in, - fmod_fini_in, - fmod_run_in, - fmod_read, - fmod_ctl_in + .init_out = fmod_init_out, + .fini_out = fmod_fini_out, + .run_out = fmod_run_out, + .write = fmod_write, + .ctl_out = fmod_ctl_out, + + .init_in = fmod_init_in, + .fini_in = fmod_fini_in, + .run_in = fmod_run_in, + .read = fmod_read, + .ctl_in = fmod_ctl_in }; struct audio_driver fmod_audio_driver = { diff --git a/audio/noaudio.c b/audio/noaudio.c index 1a7529a..40a1a2f 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -146,17 +146,17 @@ static void no_audio_fini (void *opaque) } static struct audio_pcm_ops no_pcm_ops = { - no_init_out, - no_fini_out, - no_run_out, - no_write, - no_ctl_out, - - no_init_in, - no_fini_in, - no_run_in, - no_read, - no_ctl_in + .init_out = no_init_out, + .fini_out = no_fini_out, + .run_out = no_run_out, + .write = no_write, + .ctl_out = no_ctl_out, + + .init_in = no_init_in, + .fini_in = no_fini_in, + .run_in = no_run_in, + .read = no_read, + .ctl_in = no_ctl_in }; struct audio_driver no_audio_driver = { diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 97edf9f..1c2c584 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -752,17 +752,17 @@ static struct audio_option oss_options[] = { }; static struct audio_pcm_ops oss_pcm_ops = { - oss_init_out, - oss_fini_out, - oss_run_out, - oss_write, - oss_ctl_out, - - oss_init_in, - oss_fini_in, - oss_run_in, - oss_read, - oss_ctl_in + .init_out = oss_init_out, + .fini_out = oss_fini_out, + .run_out = oss_run_out, + .write = oss_write, + .ctl_out = oss_ctl_out, + + .init_in = oss_init_in, + .fini_in = oss_fini_in, + .run_in = oss_run_in, + .read = oss_read, + .ctl_in = oss_ctl_in }; struct audio_driver oss_audio_driver = { diff --git a/audio/paaudio.c b/audio/paaudio.c index 0b469cf..43b3002 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -488,16 +488,17 @@ struct audio_option qpa_options[] = { }; static struct audio_pcm_ops qpa_pcm_ops = { - qpa_init_out, - qpa_fini_out, - qpa_run_out, - qpa_write, - qpa_ctl_out, - qpa_init_in, - qpa_fini_in, - qpa_run_in, - qpa_read, - qpa_ctl_in + .init_out = qpa_init_out, + .fini_out = qpa_fini_out, + .run_out = qpa_run_out, + .write = qpa_write, + .ctl_out = qpa_ctl_out, + + .init_in = qpa_init_in, + .fini_in = qpa_fini_in, + .run_in = qpa_run_in, + .read = qpa_read, + .ctl_in = qpa_ctl_in }; struct audio_driver pa_audio_driver = { diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index 6870fdf..86e30e3 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -426,17 +426,11 @@ static struct audio_option sdl_options[] = { }; static struct audio_pcm_ops sdl_pcm_ops = { - sdl_init_out, - sdl_fini_out, - sdl_run_out, - sdl_write_out, - sdl_ctl_out, - - NULL, - NULL, - NULL, - NULL, - NULL + .init_out = sdl_init_out, + .fini_out = sdl_fini_out, + .run_out = sdl_run_out, + .write = sdl_write_out, + .ctl_out = sdl_ctl_out, }; struct audio_driver sdl_audio_driver = { diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 96cc49d..d5585e4 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -234,17 +234,11 @@ static struct audio_option wav_options[] = { }; static struct audio_pcm_ops wav_pcm_ops = { - wav_init_out, - wav_fini_out, - wav_run_out, - wav_write_out, - wav_ctl_out, - - NULL, - NULL, - NULL, - NULL, - NULL + .init_out = wav_init_out, + .fini_out = wav_fini_out, + .run_out = wav_run_out, + .write = wav_write_out, + .ctl_out = wav_ctl_out, }; struct audio_driver wav_audio_driver = {