Update of /cvsroot/alsa/alsa-kernel/isa/sb In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/sb
Modified Files: emu8000.c emu8000_callback.c emu8000_pcm.c es968.c sb16_csp.c sb16_main.c sb8_main.c sb8_midi.c sb_common.c sb_mixer.c Log Message: C99-like structure initializers - first bunch of changes - me and Rusty Russell Index: emu8000.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- emu8000.c 12 Aug 2002 08:43:46 -0000 1.12 +++ emu8000.c 13 Aug 2002 16:13:38 -0000 1.13 @@ -866,22 +866,22 @@ static snd_kcontrol_new_t mixer_bass_control = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Synth Tone Control - Bass", - info: mixer_bass_treble_info, - get: mixer_bass_treble_get, - put: mixer_bass_treble_put, - private_value: 0, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Synth Tone Control - Bass", + .info = mixer_bass_treble_info, + .get = mixer_bass_treble_get, + .put = mixer_bass_treble_put, + .private_value = 0, }; static snd_kcontrol_new_t mixer_treble_control = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Synth Tone Control - Treble", - info: mixer_bass_treble_info, - get: mixer_bass_treble_get, - put: mixer_bass_treble_put, - private_value: 1, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Synth Tone Control - Treble", + .info = mixer_bass_treble_info, + .get = mixer_bass_treble_get, + .put = mixer_bass_treble_put, + .private_value = 1, }; /* @@ -933,22 +933,22 @@ static snd_kcontrol_new_t mixer_chorus_mode_control = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Chorus Mode", - info: mixer_chorus_reverb_info, - get: mixer_chorus_reverb_get, - put: mixer_chorus_reverb_put, - private_value: 1, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Chorus Mode", + .info = mixer_chorus_reverb_info, + .get = mixer_chorus_reverb_get, + .put = mixer_chorus_reverb_put, + .private_value = 1, }; static snd_kcontrol_new_t mixer_reverb_mode_control = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Reverb Mode", - info: mixer_chorus_reverb_info, - get: mixer_chorus_reverb_get, - put: mixer_chorus_reverb_put, - private_value: 0, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Reverb Mode", + .info = mixer_chorus_reverb_info, + .get = mixer_chorus_reverb_get, + .put = mixer_chorus_reverb_put, + .private_value = 0, }; /* @@ -995,22 +995,22 @@ static snd_kcontrol_new_t mixer_fm_chorus_depth_control = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "FM Chorus Depth", - info: mixer_fm_depth_info, - get: mixer_fm_depth_get, - put: mixer_fm_depth_put, - private_value: 1, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "FM Chorus Depth", + .info = mixer_fm_depth_info, + .get = mixer_fm_depth_get, + .put = mixer_fm_depth_put, + .private_value = 1, }; static snd_kcontrol_new_t mixer_fm_reverb_depth_control = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "FM Reverb Depth", - info: mixer_fm_depth_info, - get: mixer_fm_depth_get, - put: mixer_fm_depth_put, - private_value: 0, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "FM Reverb Depth", + .info = mixer_fm_depth_info, + .get = mixer_fm_depth_get, + .put = mixer_fm_depth_put, + .private_value = 0, }; @@ -1090,7 +1090,7 @@ emu8000_t *hw; int err; static snd_device_ops_t ops = { - dev_free: snd_emu8000_dev_free, + .dev_free = snd_emu8000_dev_free, }; if (awe_ret) Index: emu8000_callback.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000_callback.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- emu8000_callback.c 12 Aug 2002 08:43:46 -0000 1.7 +++ emu8000_callback.c 13 Aug 2002 16:13:38 -0000 1.8 @@ -59,21 +59,21 @@ * set up operators */ static snd_emux_operators_t emu8000_ops = { - owner: THIS_MODULE, - get_voice: get_voice, - prepare: start_voice, - trigger: trigger_voice, - release: release_voice, - update: update_voice, - terminate: terminate_voice, - reset: reset_voice, - sample_new: snd_emu8000_sample_new, - sample_free: snd_emu8000_sample_free, - sample_reset: snd_emu8000_sample_reset, - load_fx: load_fx, - sysex: sysex, + .owner = THIS_MODULE, + .get_voice = get_voice, + .prepare = start_voice, + .trigger = trigger_voice, + .release = release_voice, + .update = update_voice, + .terminate = terminate_voice, + .reset = reset_voice, + .sample_new = snd_emu8000_sample_new, + .sample_free = snd_emu8000_sample_free, + .sample_reset = snd_emu8000_sample_reset, + .load_fx = load_fx, + .sysex = sysex, #ifdef CONFIG_SND_SEQUENCER_OSS - oss_ioctl: oss_ioctl, + .oss_ioctl = oss_ioctl, #endif }; Index: emu8000_pcm.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000_pcm.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- emu8000_pcm.c 12 Aug 2002 08:43:46 -0000 1.6 +++ emu8000_pcm.c 13 Aug 2002 16:13:38 -0000 1.7 @@ -159,22 +159,22 @@ static snd_pcm_hardware_t emu8k_pcm_hw = { #ifdef USE_NONINTERLEAVE - info: SNDRV_PCM_INFO_NONINTERLEAVED, + .info = SNDRV_PCM_INFO_NONINTERLEAVED, #else - info: SNDRV_PCM_INFO_INTERLEAVED, + .info = SNDRV_PCM_INFO_INTERLEAVED, #endif - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, - rate_min: 4000, - rate_max: 48000, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: (128*1024), - period_bytes_min: 1024, - period_bytes_max: (128*1024), - periods_min: 2, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, + .rate_min = 4000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = (128*1024), + .period_bytes_min = 1024, + .period_bytes_max = (128*1024), + .periods_min = 2, + .periods_max = 1024, + .fifo_size = 0, }; @@ -672,16 +672,16 @@ static snd_pcm_ops_t emu8k_pcm_ops = { - open: emu8k_pcm_open, - close: emu8k_pcm_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: emu8k_pcm_hw_params, - hw_free: emu8k_pcm_hw_free, - prepare: emu8k_pcm_prepare, - trigger: emu8k_pcm_trigger, - pointer: emu8k_pcm_pointer, - copy: emu8k_pcm_copy, - silence: emu8k_pcm_silence, + .open = emu8k_pcm_open, + .close = emu8k_pcm_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = emu8k_pcm_hw_params, + .hw_free = emu8k_pcm_hw_free, + .prepare = emu8k_pcm_prepare, + .trigger = emu8k_pcm_trigger, + .pointer = emu8k_pcm_pointer, + .copy = emu8k_pcm_copy, + .silence = emu8k_pcm_silence, }; Index: es968.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- es968.c 25 May 2002 10:26:10 -0000 1.10 +++ es968.c 13 Aug 2002 16:13:38 -0000 1.11 @@ -82,7 +82,7 @@ static struct isapnp_card_id snd_es968_pnpids[] __devinitdata = { { ISAPNP_CARD_ID('E','S','S',0x0968), - devs: { ISAPNP_DEVICE_ID('E','S','S',0x0968), } + .devs = { ISAPNP_DEVICE_ID('E','S','S',0x0968), } }, { ISAPNP_CARD_END, } }; Index: sb16_csp.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16_csp.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sb16_csp.c 18 Feb 2002 16:52:05 -0000 1.6 +++ sb16_csp.c 13 Aug 2002 16:13:38 -0000 1.7 @@ -1010,19 +1010,19 @@ } static snd_kcontrol_new_t snd_sb_qsound_switch = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "3D Control - Switch", - info: snd_sb_qsound_switch_info, - get: snd_sb_qsound_switch_get, - put: snd_sb_qsound_switch_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "3D Control - Switch", + .info = snd_sb_qsound_switch_info, + .get = snd_sb_qsound_switch_get, + .put = snd_sb_qsound_switch_put }; static snd_kcontrol_new_t snd_sb_qsound_space = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "3D Control - Space", - info: snd_sb_qsound_space_info, - get: snd_sb_qsound_space_get, - put: snd_sb_qsound_space_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "3D Control - Space", + .info = snd_sb_qsound_space_info, + .get = snd_sb_qsound_space_get, + .put = snd_sb_qsound_space_put }; static int snd_sb_qsound_build(snd_sb_csp_t * p) Index: sb16_main.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sb16_main.c 11 Mar 2002 16:07:12 -0000 1.10 +++ sb16_main.c 13 Aug 2002 16:13:39 -0000 1.11 @@ -466,38 +466,38 @@ static snd_pcm_hardware_t snd_sb16_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID), - formats: 0, - rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_44100, - rate_min: 4000, - rate_max: 44100, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: (128*1024), - period_bytes_min: 64, - period_bytes_max: (128*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = 0, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_44100, + .rate_min = 4000, + .rate_max = 44100, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = (128*1024), + .period_bytes_min = 64, + .period_bytes_max = (128*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_sb16_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID), - formats: 0, - rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_44100, - rate_min: 4000, - rate_max: 44100, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: (128*1024), - period_bytes_min: 64, - period_bytes_max: (128*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = 0, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_44100, + .rate_min = 4000, + .rate_max = 44100, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = (128*1024), + .period_bytes_min = 64, + .period_bytes_max = (128*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; /* @@ -724,11 +724,11 @@ } snd_kcontrol_new_t snd_sb16_dma_control = { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "16-bit DMA Allocation", - info: snd_sb16_dma_control_info, - get: snd_sb16_dma_control_get, - put: snd_sb16_dma_control_put + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "16-bit DMA Allocation", + .info = snd_sb16_dma_control_info, + .get = snd_sb16_dma_control_get, + .put = snd_sb16_dma_control_put }; /* @@ -825,25 +825,25 @@ } static snd_pcm_ops_t snd_sb16_playback_ops = { - open: snd_sb16_playback_open, - close: snd_sb16_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_sb16_hw_params, - hw_free: snd_sb16_hw_free, - prepare: snd_sb16_playback_prepare, - trigger: snd_sb16_playback_trigger, - pointer: snd_sb16_playback_pointer, + .open = snd_sb16_playback_open, + .close = snd_sb16_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sb16_hw_params, + .hw_free = snd_sb16_hw_free, + .prepare = snd_sb16_playback_prepare, + .trigger = snd_sb16_playback_trigger, + .pointer = snd_sb16_playback_pointer, }; static snd_pcm_ops_t snd_sb16_capture_ops = { - open: snd_sb16_capture_open, - close: snd_sb16_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_sb16_hw_params, - hw_free: snd_sb16_hw_free, - prepare: snd_sb16_capture_prepare, - trigger: snd_sb16_capture_trigger, - pointer: snd_sb16_capture_pointer, + .open = snd_sb16_capture_open, + .close = snd_sb16_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sb16_hw_params, + .hw_free = snd_sb16_hw_free, + .prepare = snd_sb16_capture_prepare, + .trigger = snd_sb16_capture_trigger, + .pointer = snd_sb16_capture_pointer, }; static void snd_sb16dsp_pcm_free(snd_pcm_t *pcm) Index: sb8_main.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb8_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sb8_main.c 18 Feb 2002 13:21:15 -0000 1.8 +++ sb8_main.c 13 Aug 2002 16:13:39 -0000 1.9 @@ -49,29 +49,29 @@ #define SB8_RATE(v) (SB8_CLOCK / SB8_DEN(v)) static ratnum_t clock = { - num: SB8_CLOCK, - den_min: 1, - den_max: 256, - den_step: 1, + .num = SB8_CLOCK, + .den_min = 1, + .den_max = 256, + .den_step = 1, }; static snd_pcm_hw_constraint_ratnums_t hw_constraints_clock = { - nrats: 1, - rats: &clock, + .nrats = 1, + .rats = &clock, }; static ratnum_t stereo_clocks[] = { { - num: SB8_CLOCK, - den_min: SB8_DEN(22050), - den_max: SB8_DEN(22050), - den_step: 1, + .num = SB8_CLOCK, + .den_min = SB8_DEN(22050), + .den_max = SB8_DEN(22050), + .den_step = 1, }, { - num: SB8_CLOCK, - den_min: SB8_DEN(11025), - den_max: SB8_DEN(11025), - den_step: 1, + .num = SB8_CLOCK, + .den_min = SB8_DEN(11025), + .den_max = SB8_DEN(11025), + .den_step = 1, } }; @@ -386,40 +386,40 @@ static snd_pcm_hardware_t snd_sb8_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_U8, - rates: (SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000 | + .formats = SNDRV_PCM_FMTBIT_U8, + .rates = (SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050), - rate_min: 4000, - rate_max: 23000, - channels_min: 1, - channels_max: 1, - buffer_bytes_max: 65536, - period_bytes_min: 64, - period_bytes_max: 65536, - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .rate_min = 4000, + .rate_max = 23000, + .channels_min = 1, + .channels_max = 1, + .buffer_bytes_max = 65536, + .period_bytes_min = 64, + .period_bytes_max = 65536, + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_sb8_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_U8, - rates: (SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000 | + .formats = SNDRV_PCM_FMTBIT_U8, + .rates = (SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025), - rate_min: 4000, - rate_max: 13000, - channels_min: 1, - channels_max: 1, - buffer_bytes_max: 65536, - period_bytes_min: 64, - period_bytes_max: 65536, - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .rate_min = 4000, + .rate_max = 13000, + .channels_min = 1, + .channels_max = 1, + .buffer_bytes_max = 65536, + .period_bytes_min = 64, + .period_bytes_max = 65536, + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; /* @@ -490,25 +490,25 @@ */ static snd_pcm_ops_t snd_sb8_playback_ops = { - open: snd_sb8_open, - close: snd_sb8_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_sb8_hw_params, - hw_free: snd_sb8_hw_free, - prepare: snd_sb8_playback_prepare, - trigger: snd_sb8_playback_trigger, - pointer: snd_sb8_playback_pointer, + .open = snd_sb8_open, + .close = snd_sb8_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sb8_hw_params, + .hw_free = snd_sb8_hw_free, + .prepare = snd_sb8_playback_prepare, + .trigger = snd_sb8_playback_trigger, + .pointer = snd_sb8_playback_pointer, }; static snd_pcm_ops_t snd_sb8_capture_ops = { - open: snd_sb8_open, - close: snd_sb8_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_sb8_hw_params, - hw_free: snd_sb8_hw_free, - prepare: snd_sb8_capture_prepare, - trigger: snd_sb8_capture_trigger, - pointer: snd_sb8_capture_pointer, + .open = snd_sb8_open, + .close = snd_sb8_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sb8_hw_params, + .hw_free = snd_sb8_hw_free, + .prepare = snd_sb8_capture_prepare, + .trigger = snd_sb8_capture_trigger, + .pointer = snd_sb8_capture_pointer, }; static void snd_sb8dsp_pcm_free(snd_pcm_t *pcm) Index: sb8_midi.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb8_midi.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sb8_midi.c 12 Aug 2002 08:43:46 -0000 1.6 +++ sb8_midi.c 13 Aug 2002 16:13:39 -0000 1.7 @@ -228,16 +228,16 @@ static snd_rawmidi_ops_t snd_sb8dsp_midi_output = { - open: snd_sb8dsp_midi_output_open, - close: snd_sb8dsp_midi_output_close, - trigger: snd_sb8dsp_midi_output_trigger, + .open = snd_sb8dsp_midi_output_open, + .close = snd_sb8dsp_midi_output_close, + .trigger = snd_sb8dsp_midi_output_trigger, }; static snd_rawmidi_ops_t snd_sb8dsp_midi_input = { - open: snd_sb8dsp_midi_input_open, - close: snd_sb8dsp_midi_input_close, - trigger: snd_sb8dsp_midi_input_trigger, + .open = snd_sb8dsp_midi_input_open, + .close = snd_sb8dsp_midi_input_close, + .trigger = snd_sb8dsp_midi_input_trigger, }; int snd_sb8dsp_midi(sb_t *chip, int device, snd_rawmidi_t ** rrawmidi) Index: sb_common.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb_common.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sb_common.c 24 Jul 2002 10:42:17 -0000 1.13 +++ sb_common.c 13 Aug 2002 16:13:39 -0000 1.14 @@ -221,7 +221,7 @@ sb_t *chip; int err; static snd_device_ops_t ops = { - dev_free: snd_sbdsp_dev_free, + .dev_free = snd_sbdsp_dev_free, }; snd_assert(r_chip != NULL, return -EINVAL); Index: sb_mixer.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb_mixer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sb_mixer.c 12 Aug 2002 08:43:46 -0000 1.7 +++ sb_mixer.c 13 Aug 2002 16:13:39 -0000 1.8 @@ -61,10 +61,10 @@ */ #define SB_SINGLE(xname, reg, shift, mask) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, \ - name: xname, \ - info: snd_sbmixer_info_single, \ - get: snd_sbmixer_get_single, put: snd_sbmixer_put_single, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = xname, \ + .info = snd_sbmixer_info_single, \ + .get = snd_sbmixer_get_single, put: snd_sbmixer_put_single, \ private_value: reg | (shift << 16) | (mask << 24) } static int snd_sbmixer_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -120,10 +120,10 @@ */ #define SB_DOUBLE(xname, left_reg, right_reg, left_shift, right_shift, mask) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, \ - name: xname, \ - info: snd_sbmixer_info_double, \ - get: snd_sbmixer_get_double, put: snd_sbmixer_put_double, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = xname, \ + .info = snd_sbmixer_info_double, \ + .get = snd_sbmixer_get_double, put: snd_sbmixer_put_double, \ private_value: left_reg | (right_reg << 8) | (left_shift << 16) | (right_shift << 19) | (mask << 24) } static int snd_sbmixer_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -363,10 +363,10 @@ */ #define SB16_INPUT_SW(xname, reg1, reg2, left_shift, right_shift) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, \ - name: xname, \ - info: snd_sb16mixer_info_input_sw, \ - get: snd_sb16mixer_get_input_sw, put: snd_sb16mixer_put_input_sw, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = xname, \ + .info = snd_sb16mixer_info_input_sw, \ + .get = snd_sb16mixer_get_input_sw, put: snd_sb16mixer_put_input_sw, \ private_value: reg1 | (reg2 << 8) | (left_shift << 16) | (right_shift << 24) } static int snd_sb16mixer_info_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) @@ -455,11 +455,11 @@ SB_DOUBLE("Line Playback Volume", SB_DSP_LINE_DEV, SB_DSP_LINE_DEV, 5, 1, 7), SB_SINGLE("Mic Playback Volume", SB_DSP_MIC_DEV, 1, 3), { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Capture Source", - info: snd_sb8mixer_info_mux, - get: snd_sb8mixer_get_mux, - put: snd_sb8mixer_put_mux, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Capture Source", + .info = snd_sb8mixer_info_mux, + .get = snd_sb8mixer_get_mux, + .put = snd_sb8mixer_put_mux, }, SB_SINGLE("Capture Filter", SB_DSP_CAPTURE_FILT, 5, 1), SB_SINGLE("Capture Low-Pass Filter", SB_DSP_CAPTURE_FILT, 3, 1) ------------------------------------------------------- This sf.net email is sponsored by: Dice - The leading online job board for high-tech professionals. Search and apply for tech jobs today! http://seeker.dice.com/seeker.epl?rel_code=31 _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog