You can import this changeset into BK by piping this whole message to: '| bk receive [path to repository]' or apply the patch as usual. =================================================================== ChangeSet@1.648, 2002-10-01 10:16:17+02:00, perex@suse.cz ALSA update 2002/08/15 : - C99 structure initializers - second set of changes - USB MIDI driver - more device info for Roland/EDIROL devices include/sound/version.h | 4 sound/core/oss/mixer_oss.c | 12 sound/i2c/l3/uda1341.c | 20 - sound/i2c/tea6330t.c | 16 - sound/isa/cs423x/cs4236_lib.c | 42 +-- sound/isa/es1688/es1688_lib.c | 12 sound/isa/gus/gus_mixer.c | 12 sound/isa/sb/sb_mixer.c | 16 - sound/pci/ac97/ac97_codec.c | 10 sound/pci/ac97/ak4531_codec.c | 26 +- sound/pci/ali5451/ali5451.c | 102 ++++---- sound/pci/cmipci.c | 2 sound/pci/cs46xx/cs46xx_lib.c | 276 +++++++++++----------- sound/pci/emu10k1/emu10k1.c | 8 sound/pci/emu10k1/emu10k1_callback.c | 20 - sound/pci/emu10k1/emu10k1_main.c | 2 sound/pci/emu10k1/emufx.c | 18 - sound/pci/emu10k1/emumixer.c | 76 +++--- sound/pci/emu10k1/emumpu401.c | 12 sound/pci/emu10k1/emupcm.c | 144 +++++------ sound/pci/es1968.c | 58 ++-- sound/pci/fm801.c | 80 +++--- sound/pci/ice1712.c | 434 +++++++++++++++++------------------ sound/pci/intel8x0.c | 148 +++++------ sound/pci/korg1212/korg1212.c | 166 ++++++------- sound/pci/maestro3.c | 46 +-- sound/pci/nm256/nm256.c | 54 ++-- sound/pci/rme32.c | 174 +++++++------- sound/pci/rme96.c | 300 ++++++++++++------------ sound/pci/rme9652/hdsp.c | 244 +++++++++---------- sound/pci/rme9652/rme9652.c | 222 ++++++++--------- sound/pci/sonicvibes.c | 116 ++++----- sound/pci/trident/trident.c | 12 sound/pci/trident/trident_main.c | 314 ++++++++++++------------- sound/pci/via686.c | 116 ++++----- sound/pci/via8233.c | 112 ++++----- sound/pci/ymfpci/ymfpci.c | 12 sound/pci/ymfpci/ymfpci_main.c | 224 +++++++++--------- sound/ppc/awacs.c | 8 sound/ppc/burgundy.c | 17 - sound/ppc/daca.c | 6 sound/ppc/pmac.c | 94 +++---- sound/ppc/tumbler.c | 8 sound/usb/usbaudio.c | 2 sound/usb/usbmidi.c | 21 + sound/usb/usbmixer.c | 30 +- 46 files changed, 1934 insertions(+), 1914 deletions(-) diff -Nru a/include/sound/version.h b/include/sound/version.h --- a/include/sound/version.h Tue Oct 1 17:07:16 2002 +++ b/include/sound/version.h Tue Oct 1 17:07:16 2002 @@ -1,3 +1,3 @@ /* include/version.h. Generated automatically by configure. */ -#define CONFIG_SND_VERSION "0.9.0rc2" -#define CONFIG_SND_DATE " (Wed Aug 14 17:22:18 2002 UTC)" +#define CONFIG_SND_VERSION "0.9.0rc3" +#define CONFIG_SND_DATE " (Thu Aug 15 19:10:53 2002 UTC)" diff -Nru a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c --- a/sound/core/oss/mixer_oss.c Tue Oct 1 17:07:16 2002 +++ b/sound/core/oss/mixer_oss.c Tue Oct 1 17:07:16 2002 @@ -383,17 +383,17 @@ static struct file_operations snd_mixer_oss_f_ops = { #ifndef LINUX_2_2 - owner: THIS_MODULE, + .owner = THIS_MODULE, #endif - open: snd_mixer_oss_open, - release: snd_mixer_oss_release, - ioctl: snd_mixer_oss_ioctl, + .open = snd_mixer_oss_open, + .release = snd_mixer_oss_release, + .ioctl = snd_mixer_oss_ioctl, }; static snd_minor_t snd_mixer_oss_reg = { - comment: "mixer", - f_ops: &snd_mixer_oss_f_ops, + .comment = "mixer", + .f_ops = &snd_mixer_oss_f_ops, }; /* diff -Nru a/sound/i2c/l3/uda1341.c b/sound/i2c/l3/uda1341.c --- a/sound/i2c/l3/uda1341.c Tue Oct 1 17:07:16 2002 +++ b/sound/i2c/l3/uda1341.c Tue Oct 1 17:07:16 2002 @@ -16,7 +16,7 @@ * 2002-04-12 Tomas Kasparek Proc interface update, code cleanup */ -/* $Id: uda1341.c,v 1.3 2002/08/13 16:13:36 perex Exp $ */ +/* $Id: uda1341.c,v 1.4 2002/08/15 12:13:06 perex Exp $ */ #include #include @@ -459,9 +459,9 @@ /* {{{ UDA1341 single functions */ #define UDA1341_SINGLE(xname, where, reg, shift, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_uda1341_info_single, \ - .get = snd_uda1341_get_single, put: snd_uda1341_put_single, \ - private_value: where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_uda1341_info_single, \ + .get = snd_uda1341_get_single, .put = snd_uda1341_put_single, \ + .private_value = where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \ } static int snd_uda1341_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -521,9 +521,9 @@ /* {{{ UDA1341 enum functions */ #define UDA1341_ENUM(xname, where, reg, shift, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_uda1341_info_enum, \ - .get = snd_uda1341_get_enum, put: snd_uda1341_put_enum, \ - private_value: where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_uda1341_info_enum, \ + .get = snd_uda1341_get_enum, .put = snd_uda1341_put_enum, \ + .private_value = where | reg << 5 | (shift << 9) | (mask << 12) | (invert << 18) \ } static int snd_uda1341_info_enum(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -583,9 +583,9 @@ /* {{{ UDA1341 2regs functions */ #define UDA1341_2REGS(xname, where, reg_1, reg_2, shift_1, shift_2, mask_1, mask_2, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: (xname), info: snd_uda1341_info_2regs, \ - .get = snd_uda1341_get_2regs, put: snd_uda1341_put_2regs, \ - private_value: where | (reg_1 << 5) | (reg_2 << 9) | (shift_1 << 13) | (shift_2 << 16) | \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), .info = snd_uda1341_info_2regs, \ + .get = snd_uda1341_get_2regs, .put = snd_uda1341_put_2regs, \ + .private_value = where | (reg_1 << 5) | (reg_2 << 9) | (shift_1 << 13) | (shift_2 << 16) | \ (mask_1 << 19) | (mask_2 << 25) | (invert << 31) \ } diff -Nru a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c --- a/sound/i2c/tea6330t.c Tue Oct 1 17:07:16 2002 +++ b/sound/i2c/tea6330t.c Tue Oct 1 17:07:16 2002 @@ -67,9 +67,9 @@ #endif #define TEA6330T_MASTER_VOLUME(xname, xindex) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_tea6330t_info_master_volume, \ - .get = snd_tea6330t_get_master_volume, put: snd_tea6330t_put_master_volume } + .get = snd_tea6330t_get_master_volume, .put = snd_tea6330t_put_master_volume } static int snd_tea6330t_info_master_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -123,9 +123,9 @@ } #define TEA6330T_MASTER_SWITCH(xname, xindex) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_tea6330t_info_master_switch, \ - .get = snd_tea6330t_get_master_switch, put: snd_tea6330t_put_master_switch } + .get = snd_tea6330t_get_master_switch, .put = snd_tea6330t_put_master_switch } static int snd_tea6330t_info_master_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -172,9 +172,9 @@ } #define TEA6330T_BASS(xname, xindex) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_tea6330t_info_bass, \ - .get = snd_tea6330t_get_bass, put: snd_tea6330t_put_bass } + .get = snd_tea6330t_get_bass, .put = snd_tea6330t_put_bass } static int snd_tea6330t_info_bass(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -216,9 +216,9 @@ } #define TEA6330T_TREBLE(xname, xindex) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_tea6330t_info_treble, \ - .get = snd_tea6330t_get_treble, put: snd_tea6330t_put_treble } + .get = snd_tea6330t_get_treble, .put = snd_tea6330t_put_treble } static int snd_tea6330t_info_treble(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { diff -Nru a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c --- a/sound/isa/cs423x/cs4236_lib.c Tue Oct 1 17:07:16 2002 +++ b/sound/isa/cs423x/cs4236_lib.c Tue Oct 1 17:07:16 2002 @@ -366,10 +366,10 @@ */ #define CS4236_SINGLE(xname, xindex, reg, shift, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_cs4236_info_single, \ - .get = snd_cs4236_get_single, put: snd_cs4236_put_single, \ - private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) } + .get = snd_cs4236_get_single, .put = snd_cs4236_put_single, \ + .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) } static int snd_cs4236_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -423,10 +423,10 @@ } #define CS4236_SINGLEC(xname, xindex, reg, shift, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_cs4236_info_single, \ - .get = snd_cs4236_get_singlec, put: snd_cs4236_put_singlec, \ - private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) } + .get = snd_cs4236_get_singlec, .put = snd_cs4236_put_singlec, \ + .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) } static int snd_cs4236_get_singlec(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) { @@ -469,10 +469,10 @@ } #define CS4236_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_cs4236_info_double, \ - .get = snd_cs4236_get_double, put: snd_cs4236_put_double, \ - private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } + .get = snd_cs4236_get_double, .put = snd_cs4236_put_double, \ + .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } static int snd_cs4236_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -545,10 +545,10 @@ } #define CS4236_DOUBLE1(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_cs4236_info_double, \ - .get = snd_cs4236_get_double1, put: snd_cs4236_put_double1, \ - private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } + .get = snd_cs4236_get_double1, .put = snd_cs4236_put_double1, \ + .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } static int snd_cs4236_get_double1(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) { @@ -604,10 +604,10 @@ } #define CS4236_MASTER_DIGITAL(xname, xindex) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_cs4236_info_double, \ - .get = snd_cs4236_get_master_digital, put: snd_cs4236_put_master_digital, \ - private_value: 71 << 24 } + .get = snd_cs4236_get_master_digital, .put = snd_cs4236_put_master_digital, \ + .private_value = 71 << 24 } static inline int snd_cs4236_mixer_master_digital_invert_volume(int vol) { @@ -646,10 +646,10 @@ } #define CS4235_OUTPUT_ACCU(xname, xindex) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_cs4236_info_double, \ - .get = snd_cs4235_get_output_accu, put: snd_cs4235_put_output_accu, \ - private_value: 3 << 24 } + .get = snd_cs4235_get_output_accu, .put = snd_cs4235_put_output_accu, \ + .private_value = 3 << 24 } static inline int snd_cs4235_mixer_output_accu_get_volume(int vol) { @@ -807,10 +807,10 @@ }; #define CS4236_IEC958_ENABLE(xname, xindex) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_cs4236_info_single, \ - .get = snd_cs4236_get_iec958_switch, put: snd_cs4236_put_iec958_switch, \ - private_value: 1 << 16 } + .get = snd_cs4236_get_iec958_switch, .put = snd_cs4236_put_iec958_switch, \ + .private_value = 1 << 16 } static int snd_cs4236_get_iec958_switch(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) { diff -Nru a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c --- a/sound/isa/es1688/es1688_lib.c Tue Oct 1 17:07:16 2002 +++ b/sound/isa/es1688/es1688_lib.c Tue Oct 1 17:07:16 2002 @@ -800,10 +800,10 @@ } #define ES1688_SINGLE(xname, xindex, reg, shift, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_es1688_info_single, \ - .get = snd_es1688_get_single, put: snd_es1688_put_single, \ - private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) } + .get = snd_es1688_get_single, .put = snd_es1688_put_single, \ + .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) } static int snd_es1688_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -859,10 +859,10 @@ } #define ES1688_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_es1688_info_double, \ - .get = snd_es1688_get_double, put: snd_es1688_put_double, \ - private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } + .get = snd_es1688_get_double, .put = snd_es1688_put_double, \ + .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } static int snd_es1688_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { diff -Nru a/sound/isa/gus/gus_mixer.c b/sound/isa/gus/gus_mixer.c --- a/sound/isa/gus/gus_mixer.c Tue Oct 1 17:07:16 2002 +++ b/sound/isa/gus/gus_mixer.c Tue Oct 1 17:07:16 2002 @@ -33,10 +33,10 @@ */ #define GF1_SINGLE(xname, xindex, shift, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_gf1_info_single, \ - .get = snd_gf1_get_single, put: snd_gf1_put_single, \ - private_value: shift | (invert << 8) } + .get = snd_gf1_get_single, .put = snd_gf1_put_single, \ + .private_value = shift | (invert << 8) } static int snd_gf1_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -83,10 +83,10 @@ } #define ICS_DOUBLE(xname, xindex, addr) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ .info = snd_ics_info_double, \ - .get = snd_ics_get_double, put: snd_ics_put_double, \ - private_value: addr } + .get = snd_ics_get_double, .put = snd_ics_put_double, \ + .private_value = addr } static int snd_ics_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { diff -Nru a/sound/isa/sb/sb_mixer.c b/sound/isa/sb/sb_mixer.c --- a/sound/isa/sb/sb_mixer.c Tue Oct 1 17:07:16 2002 +++ b/sound/isa/sb/sb_mixer.c Tue Oct 1 17:07:16 2002 @@ -65,7 +65,7 @@ .name = xname, \ .info = snd_sbmixer_info_single, \ .get = snd_sbmixer_get_single, put: snd_sbmixer_put_single, \ - private_value: reg | (shift << 16) | (mask << 24) } + .private_value = reg | (shift << 16) | (mask << 24) } static int snd_sbmixer_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -124,7 +124,7 @@ .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) } + .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) { @@ -367,7 +367,7 @@ .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) } + .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) { @@ -529,11 +529,11 @@ SB_DOUBLE("PCM Playback Switch", SB_DT019X_OUTPUT_SW2, SB_DT019X_OUTPUT_SW2, 2,1, 1), SB_DOUBLE("Synth Playback Switch", SB_DT019X_OUTPUT_SW2, SB_DT019X_OUTPUT_SW2, 4,3, 1), { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Capture Source", - info: snd_dt019x_input_sw_info, - get: snd_dt019x_input_sw_get, - put: snd_dt019x_input_sw_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Capture Source", + .info = snd_dt019x_input_sw_info, + .get = snd_dt019x_input_sw_get, + .put = snd_dt019x_input_sw_put, }, }; diff -Nru a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c --- a/sound/pci/ac97/ac97_codec.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/ac97/ac97_codec.c Tue Oct 1 17:07:16 2002 @@ -590,11 +590,11 @@ static const snd_kcontrol_new_t snd_ac97_controls_capture[3] = { { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Capture Source", - info: snd_ac97_info_mux, - get: snd_ac97_get_mux, - put: snd_ac97_put_mux, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Capture Source", + .info = snd_ac97_info_mux, + .get = snd_ac97_get_mux, + .put = snd_ac97_put_mux, }, AC97_SINGLE("Capture Switch", AC97_REC_GAIN, 15, 1, 1), AC97_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 15, 0) diff -Nru a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ac97/ak4531_codec.c --- a/sound/pci/ac97/ak4531_codec.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/ac97/ak4531_codec.c Tue Oct 1 17:07:16 2002 @@ -56,10 +56,10 @@ */ #define AK4531_SINGLE(xname, xindex, reg, shift, mask, invert) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_ak4531_info_single, \ - get: snd_ak4531_get_single, put: snd_ak4531_put_single, \ - private_value: reg | (shift << 16) | (mask << 24) | (invert << 22) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_ak4531_info_single, \ + .get = snd_ak4531_get_single, .put = snd_ak4531_put_single, \ + .private_value = reg | (shift << 16) | (mask << 24) | (invert << 22) } static int snd_ak4531_info_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -117,10 +117,10 @@ } #define AK4531_DOUBLE(xname, xindex, left_reg, right_reg, left_shift, right_shift, mask, invert) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_ak4531_info_double, \ - get: snd_ak4531_get_double, put: snd_ak4531_put_double, \ - private_value: left_reg | (right_reg << 8) | (left_shift << 16) | (right_shift << 19) | (mask << 24) | (invert << 22) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_ak4531_info_double, \ + .get = snd_ak4531_get_double, .put = snd_ak4531_put_double, \ + .private_value = left_reg | (right_reg << 8) | (left_shift << 16) | (right_shift << 19) | (mask << 24) | (invert << 22) } static int snd_ak4531_info_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -196,10 +196,10 @@ } #define AK4531_INPUT_SW(xname, xindex, reg1, reg2, left_shift, right_shift) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_ak4531_info_input_sw, \ - get: snd_ak4531_get_input_sw, put: snd_ak4531_put_input_sw, \ - private_value: reg1 | (reg2 << 8) | (left_shift << 16) | (right_shift << 24) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_ak4531_info_input_sw, \ + .get = snd_ak4531_get_input_sw, .put = snd_ak4531_put_input_sw, \ + .private_value = reg1 | (reg2 << 8) | (left_shift << 16) | (right_shift << 24) } static int snd_ak4531_info_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -362,7 +362,7 @@ int idx, err; ak4531_t * ak4531; static snd_device_ops_t ops = { - dev_free: snd_ak4531_dev_free, + .dev_free = snd_ak4531_dev_free, }; snd_assert(rak4531 != NULL, return -EINVAL); diff -Nru a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c --- a/sound/pci/ali5451/ali5451.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/ali5451/ali5451.c Tue Oct 1 17:07:16 2002 @@ -1540,22 +1540,22 @@ static snd_pcm_hardware_t snd_ali_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START), - formats: (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_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: (256*1024), - period_bytes_min: 64, - period_bytes_max: (256*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .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 = (256*1024), + .period_bytes_min = 64, + .period_bytes_max = (256*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; /* @@ -1564,22 +1564,22 @@ static snd_pcm_hardware_t snd_ali_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START), - formats: (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_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: 64, - period_bytes_max: (128*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .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 = 64, + .period_bytes_max = (128*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static void snd_ali_pcm_free_substream(snd_pcm_runtime_t *runtime) @@ -1666,25 +1666,25 @@ } static snd_pcm_ops_t snd_ali_playback_ops = { - open: snd_ali_playback_open, - close: snd_ali_playback_close, - ioctl: snd_ali_ioctl, - hw_params: snd_ali_playback_hw_params, - hw_free: snd_ali_playback_hw_free, - prepare: snd_ali_playback_prepare, - trigger: snd_ali_trigger, - pointer: snd_ali_playback_pointer, + .open = snd_ali_playback_open, + .close = snd_ali_playback_close, + .ioctl = snd_ali_ioctl, + .hw_params = snd_ali_playback_hw_params, + .hw_free = snd_ali_playback_hw_free, + .prepare = snd_ali_playback_prepare, + .trigger = snd_ali_trigger, + .pointer = snd_ali_playback_pointer, }; static snd_pcm_ops_t snd_ali_capture_ops = { - open: snd_ali_capture_open, - close: snd_ali_capture_close, - ioctl: snd_ali_ioctl, - hw_params: snd_ali_capture_hw_params, - hw_free: snd_ali_capture_hw_free, - prepare: snd_ali_capture_prepare, - trigger: snd_ali_trigger, - pointer: snd_ali_capture_pointer, + .open = snd_ali_capture_open, + .close = snd_ali_capture_close, + .ioctl = snd_ali_ioctl, + .hw_params = snd_ali_capture_hw_params, + .hw_free = snd_ali_capture_hw_free, + .prepare = snd_ali_capture_prepare, + .trigger = snd_ali_trigger, + .pointer = snd_ali_capture_pointer, }; @@ -1722,9 +1722,9 @@ } #define ALI5451_SPDIF(xname, xindex, value) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\ -info: snd_ali5451_spdif_info, get: snd_ali5451_spdif_get, \ -put: snd_ali5451_spdif_put, private_value: value} +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\ +.info = snd_ali5451_spdif_info, .get = snd_ali5451_spdif_get, \ +.put = snd_ali5451_spdif_put, .private_value = value} static int snd_ali5451_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) { @@ -2240,13 +2240,13 @@ } static struct pci_driver driver = { - name: "ALI 5451", - id_table: snd_ali_ids, - probe: snd_ali_probe, - remove: __devexit_p(snd_ali_remove), + .name = "ALI 5451", + .id_table = snd_ali_ids, + .probe = snd_ali_probe, + .remove = __devexit_p(snd_ali_remove), #ifdef CONFIG_PM - suspend: snd_ali_suspend, - resume: snd_ali_resume, + .suspend = snd_ali_suspend, + .resume = snd_ali_resume, #endif }; diff -Nru a/sound/pci/cmipci.c b/sound/pci/cmipci.c --- a/sound/pci/cmipci.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/cmipci.c Tue Oct 1 17:07:16 2002 @@ -2506,7 +2506,7 @@ cmipci_t *cm; int err; static snd_device_ops_t ops = { - dev_free: snd_cmipci_dev_free, + .dev_free = snd_cmipci_dev_free, }; unsigned int val = 0; int pcm_index, pcm_spdif_index; diff -Nru a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c --- a/sound/pci/cs46xx/cs46xx_lib.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/cs46xx/cs46xx_lib.c Tue Oct 1 17:07:16 2002 @@ -1246,44 +1246,44 @@ static snd_pcm_hardware_t snd_cs46xx_playback = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_RESUME), - formats: (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | + .formats = (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U16_BE), - .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, - .rate_min = 5500, - .rate_max = 48000, - .channels_min = 1, - .channels_max = 2, - .buffer_bytes_max = (256 * 1024), - .period_bytes_min = CS46XX_PERIOD_SIZE, - .period_bytes_max = CS46XX_PERIOD_SIZE, - .periods_min = CS46XX_FRAGS, - .periods_max = 1024, - .fifo_size = 0, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, + .rate_min = 5500, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = (256 * 1024), + .period_bytes_min = CS46XX_PERIOD_SIZE, + .period_bytes_max = CS46XX_PERIOD_SIZE, + .periods_min = CS46XX_FRAGS, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_cs46xx_capture = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_RESUME), - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, - .rate_min = 5500, - .rate_max = 48000, - .channels_min = 2, - .channels_max = 2, - .buffer_bytes_max = (256 * 1024), - .period_bytes_min = CS46XX_PERIOD_SIZE, - .period_bytes_max = CS46XX_PERIOD_SIZE, - .periods_min = CS46XX_FRAGS, - .periods_max = 1024, - .fifo_size = 0, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, + .rate_min = 5500, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = (256 * 1024), + .period_bytes_min = CS46XX_PERIOD_SIZE, + .period_bytes_max = CS46XX_PERIOD_SIZE, + .periods_min = CS46XX_FRAGS, + .periods_max = 1024, + .fifo_size = 0, }; static void snd_cs46xx_pcm_free_substream(snd_pcm_runtime_t *runtime) @@ -1387,49 +1387,49 @@ } snd_pcm_ops_t snd_cs46xx_playback_ops = { - .open = snd_cs46xx_playback_open, - .close = snd_cs46xx_playback_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_cs46xx_playback_hw_params, - .hw_free = snd_cs46xx_playback_hw_free, - .prepare = snd_cs46xx_playback_prepare, - .trigger = snd_cs46xx_playback_trigger, - .pointer = snd_cs46xx_playback_direct_pointer, + .open = snd_cs46xx_playback_open, + .close = snd_cs46xx_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_cs46xx_playback_hw_params, + .hw_free = snd_cs46xx_playback_hw_free, + .prepare = snd_cs46xx_playback_prepare, + .trigger = snd_cs46xx_playback_trigger, + .pointer = snd_cs46xx_playback_direct_pointer, }; snd_pcm_ops_t snd_cs46xx_playback_indirect_ops = { - .open = snd_cs46xx_playback_open, - .close = snd_cs46xx_playback_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_cs46xx_playback_hw_params, - .hw_free = snd_cs46xx_playback_hw_free, - .prepare = snd_cs46xx_playback_prepare, - .trigger = snd_cs46xx_playback_trigger, - .copy = snd_cs46xx_playback_copy, - .pointer = snd_cs46xx_playback_indirect_pointer, + .open = snd_cs46xx_playback_open, + .close = snd_cs46xx_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_cs46xx_playback_hw_params, + .hw_free = snd_cs46xx_playback_hw_free, + .prepare = snd_cs46xx_playback_prepare, + .trigger = snd_cs46xx_playback_trigger, + .copy = snd_cs46xx_playback_copy, + .pointer = snd_cs46xx_playback_indirect_pointer, }; snd_pcm_ops_t snd_cs46xx_capture_ops = { - .open = snd_cs46xx_capture_open, - .close = snd_cs46xx_capture_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_cs46xx_capture_hw_params, - .hw_free = snd_cs46xx_capture_hw_free, - .prepare = snd_cs46xx_capture_prepare, - .trigger = snd_cs46xx_capture_trigger, - .pointer = snd_cs46xx_capture_direct_pointer, + .open = snd_cs46xx_capture_open, + .close = snd_cs46xx_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_cs46xx_capture_hw_params, + .hw_free = snd_cs46xx_capture_hw_free, + .prepare = snd_cs46xx_capture_prepare, + .trigger = snd_cs46xx_capture_trigger, + .pointer = snd_cs46xx_capture_direct_pointer, }; snd_pcm_ops_t snd_cs46xx_capture_indirect_ops = { - .open = snd_cs46xx_capture_open, - .close = snd_cs46xx_capture_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_cs46xx_capture_hw_params, - .hw_free = snd_cs46xx_capture_hw_free, - .prepare = snd_cs46xx_capture_prepare, - .trigger = snd_cs46xx_capture_trigger, - .copy = snd_cs46xx_capture_copy, - .pointer = snd_cs46xx_capture_indirect_pointer, + .open = snd_cs46xx_capture_open, + .close = snd_cs46xx_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_cs46xx_capture_hw_params, + .hw_free = snd_cs46xx_capture_hw_free, + .prepare = snd_cs46xx_capture_prepare, + .trigger = snd_cs46xx_capture_trigger, + .copy = snd_cs46xx_capture_copy, + .pointer = snd_cs46xx_capture_indirect_pointer, }; static void snd_cs46xx_pcm_free(snd_pcm_t *pcm) @@ -1768,103 +1768,103 @@ static snd_kcontrol_new_t snd_cs46xx_controls[] __devinitdata = { { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "DAC Volume", - info: snd_cs46xx_vol_info, - get: snd_cs46xx_vol_get, - put: snd_cs46xx_vol_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "DAC Volume", + .info = snd_cs46xx_vol_info, + .get = snd_cs46xx_vol_get, + .put = snd_cs46xx_vol_put, #ifndef CONFIG_SND_CS46XX_NEW_DSP - private_value: BA1_PVOL, + .private_value = BA1_PVOL, #else - private_value: (MASTERMIX_SCB_ADDR + 0xE) << 2, + .private_value = (MASTERMIX_SCB_ADDR + 0xE) << 2, #endif }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "ADC Volume", - info: snd_cs46xx_vol_info, - get: snd_cs46xx_vol_get, - put: snd_cs46xx_vol_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "ADC Volume", + .info = snd_cs46xx_vol_info, + .get = snd_cs46xx_vol_get, + .put = snd_cs46xx_vol_put, #ifndef CONFIG_SND_CS46XX_NEW_DSP - private_value: BA1_CVOL, + .private_value = BA1_CVOL, #else - private_value: (VARIDECIMATE_SCB_ADDR + 0xE) << 2, + .private_value = (VARIDECIMATE_SCB_ADDR + 0xE) << 2, #endif }, #ifdef CONFIG_SND_CS46XX_NEW_DSP { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "ADC Capture Switch", - info: snd_mixer_boolean_info, - get: snd_cs46xx_adc_capture_get, - put: snd_cs46xx_adc_capture_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "ADC Capture Switch", + .info = snd_mixer_boolean_info, + .get = snd_cs46xx_adc_capture_get, + .put = snd_cs46xx_adc_capture_put }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "DAC Capture Switch", - info: snd_mixer_boolean_info, - get: snd_cs46xx_pcm_capture_get, - put: snd_cs46xx_pcm_capture_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "DAC Capture Switch", + .info = snd_mixer_boolean_info, + .get = snd_cs46xx_pcm_capture_get, + .put = snd_cs46xx_pcm_capture_put }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "IEC 958 Output Switch", - info: snd_mixer_boolean_info, - get: snd_cs46xx_iec958_get, - put: snd_cs46xx_iec958_put, - private_value: CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "IEC 958 Output Switch", + .info = snd_mixer_boolean_info, + .get = snd_cs46xx_iec958_get, + .put = snd_cs46xx_iec958_put, + .private_value = CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT, }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "IEC 958 Input Switch", - info: snd_mixer_boolean_info, - get: snd_cs46xx_iec958_get, - put: snd_cs46xx_iec958_put, - private_value: CS46XX_MIXER_SPDIF_INPUT_ELEMENT, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "IEC 958 Input Switch", + .info = snd_mixer_boolean_info, + .get = snd_cs46xx_iec958_get, + .put = snd_cs46xx_iec958_put, + .private_value = CS46XX_MIXER_SPDIF_INPUT_ELEMENT, }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "IEC 958 Input Volume", - info: snd_cs46xx_vol_info, - get: snd_cs46xx_vol_get, - put: snd_cs46xx_vol_put, - private_value: (ASYNCRX_SCB_ADDR + 0xE) << 2, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "IEC 958 Input Volume", + .info = snd_cs46xx_vol_info, + .get = snd_cs46xx_vol_get, + .put = snd_cs46xx_vol_put, + .private_value = (ASYNCRX_SCB_ADDR + 0xE) << 2, }, #endif #ifdef CONFIG_SND_CS46XX_DEBUG_GPIO { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "EGPIO select", - info: snd_cs46xx_egpio_select_info, - get: snd_cs46xx_egpio_select_get, - put: snd_cs46xx_egpio_select_put, - private_value: 0, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "EGPIO select", + .info = snd_cs46xx_egpio_select_info, + .get = snd_cs46xx_egpio_select_get, + .put = snd_cs46xx_egpio_select_put, + .private_value = 0, }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "EGPIO Input/Output", - info: snd_mixer_boolean_info, - get: snd_cs46xx_egpio_get, - put: snd_cs46xx_egpio_put, - private_value: BA0_EGPIODR, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "EGPIO Input/Output", + .info = snd_mixer_boolean_info, + .get = snd_cs46xx_egpio_get, + .put = snd_cs46xx_egpio_put, + .private_value = BA0_EGPIODR, }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "EGPIO CMOS/Open drain", - info: snd_mixer_boolean_info, - get: snd_cs46xx_egpio_get, - put: snd_cs46xx_egpio_put, - private_value: BA0_EGPIOPTR, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "EGPIO CMOS/Open drain", + .info = snd_mixer_boolean_info, + .get = snd_cs46xx_egpio_get, + .put = snd_cs46xx_egpio_put, + .private_value = BA0_EGPIOPTR, }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "EGPIO On/Off", - info: snd_mixer_boolean_info, - get: snd_cs46xx_egpio_get, - put: snd_cs46xx_egpio_put, - private_value: BA0_EGPIOSR, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "EGPIO On/Off", + .info = snd_mixer_boolean_info, + .get = snd_cs46xx_egpio_get, + .put = snd_cs46xx_egpio_put, + .private_value = BA0_EGPIOSR, }, #endif }; @@ -1873,11 +1873,11 @@ /* Only available on the Hercules Game Theater XP soundcard */ static snd_kcontrol_new_t snd_hercules_controls[] __devinitdata = { { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Optical/Coaxial SPDIF Input Switch", - info: snd_mixer_boolean_info, - get: snd_herc_spdif_select_get, - put: snd_herc_spdif_select_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Optical/Coaxial SPDIF Input Switch", + .info = snd_mixer_boolean_info, + .get = snd_herc_spdif_select_get, + .put = snd_herc_spdif_select_put, }, }; #endif @@ -2125,16 +2125,16 @@ static snd_rawmidi_ops_t snd_cs46xx_midi_output = { - .open = snd_cs46xx_midi_output_open, - .close = snd_cs46xx_midi_output_close, - .trigger = snd_cs46xx_midi_output_trigger, + .open = snd_cs46xx_midi_output_open, + .close = snd_cs46xx_midi_output_close, + .trigger = snd_cs46xx_midi_output_trigger, }; static snd_rawmidi_ops_t snd_cs46xx_midi_input = { - .open = snd_cs46xx_midi_input_open, - .close = snd_cs46xx_midi_input_close, - .trigger = snd_cs46xx_midi_input_trigger, + .open = snd_cs46xx_midi_input_open, + .close = snd_cs46xx_midi_input_close, + .trigger = snd_cs46xx_midi_input_trigger, }; int __devinit snd_cs46xx_midi(cs46xx_t *chip, int device, snd_rawmidi_t **rrawmidi) @@ -3171,7 +3171,7 @@ struct cs_card_type *cp; u16 ss_card, ss_vendor; static snd_device_ops_t ops = { - .dev_free = snd_cs46xx_dev_free, + .dev_free = snd_cs46xx_dev_free, }; *rchip = NULL; diff -Nru a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c --- a/sound/pci/emu10k1/emu10k1.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/emu10k1/emu10k1.c Tue Oct 1 17:07:16 2002 @@ -199,10 +199,10 @@ } static struct pci_driver driver = { - name: "EMU10K1/Audigy", - id_table: snd_emu10k1_ids, - probe: snd_card_emu10k1_probe, - remove: __devexit_p(snd_card_emu10k1_remove), + .name = "EMU10K1/Audigy", + .id_table = snd_emu10k1_ids, + .probe = snd_card_emu10k1_probe, + .remove = __devexit_p(snd_card_emu10k1_remove), }; static int __init alsa_card_emu10k1_init(void) diff -Nru a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c --- a/sound/pci/emu10k1/emu10k1_callback.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/emu10k1/emu10k1_callback.c Tue Oct 1 17:07:16 2002 @@ -60,16 +60,16 @@ * set up operators */ static snd_emux_operators_t emu10k1_ops = { - owner: THIS_MODULE, - get_voice: get_voice, - prepare: start_voice, - trigger: trigger_voice, - release: release_voice, - update: update_voice, - terminate: terminate_voice, - free_voice: free_voice, - sample_new: snd_emu10k1_sample_new, - sample_free: snd_emu10k1_sample_free, + .owner = THIS_MODULE, + .get_voice = get_voice, + .prepare = start_voice, + .trigger = trigger_voice, + .release = release_voice, + .update = update_voice, + .terminate = terminate_voice, + .free_voice = free_voice, + .sample_new = snd_emu10k1_sample_new, + .sample_free = snd_emu10k1_sample_free, }; void diff -Nru a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c --- a/sound/pci/emu10k1/emu10k1_main.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/emu10k1/emu10k1_main.c Tue Oct 1 17:07:16 2002 @@ -535,7 +535,7 @@ int err; int is_audigy; static snd_device_ops_t ops = { - dev_free: snd_emu10k1_dev_free, + .dev_free = snd_emu10k1_dev_free, }; *remu = NULL; diff -Nru a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c --- a/sound/pci/emu10k1/emufx.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/emu10k1/emufx.c Tue Oct 1 17:07:16 2002 @@ -739,15 +739,15 @@ } static snd_pcm_ops_t snd_emu10k1_fx8010_playback_ops = { - open: snd_emu10k1_fx8010_playback_open, - close: snd_emu10k1_fx8010_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_emu10k1_fx8010_playback_hw_params, - hw_free: snd_emu10k1_fx8010_playback_hw_free, - prepare: snd_emu10k1_fx8010_playback_prepare, - trigger: snd_emu10k1_fx8010_playback_trigger, - copy: snd_emu10k1_fx8010_playback_copy, - pointer: snd_emu10k1_fx8010_playback_pointer, + .open = snd_emu10k1_fx8010_playback_open, + .close = snd_emu10k1_fx8010_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_emu10k1_fx8010_playback_hw_params, + .hw_free = snd_emu10k1_fx8010_playback_hw_free, + .prepare = snd_emu10k1_fx8010_playback_prepare, + .trigger = snd_emu10k1_fx8010_playback_trigger, + .copy = snd_emu10k1_fx8010_playback_copy, + .pointer = snd_emu10k1_fx8010_playback_pointer, }; static void snd_emu10k1_fx8010_pcm_free(snd_pcm_t *pcm) diff -Nru a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c --- a/sound/pci/emu10k1/emumixer.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/emu10k1/emumixer.c Tue Oct 1 17:07:16 2002 @@ -91,20 +91,20 @@ static snd_kcontrol_new_t snd_emu10k1_spdif_mask_control = { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), - info: snd_emu10k1_spdif_info, - get: snd_emu10k1_spdif_get_mask + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), + .info = snd_emu10k1_spdif_info, + .get = snd_emu10k1_spdif_get_mask }; static snd_kcontrol_new_t snd_emu10k1_spdif_control = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - info: snd_emu10k1_spdif_info, - get: snd_emu10k1_spdif_get, - put: snd_emu10k1_spdif_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), + .info = snd_emu10k1_spdif_info, + .get = snd_emu10k1_spdif_get, + .put = snd_emu10k1_spdif_put }; @@ -201,12 +201,12 @@ static snd_kcontrol_new_t snd_emu10k1_send_routing_control = { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "EMU10K1 PCM Send Routing", - info: snd_emu10k1_send_routing_info, - get: snd_emu10k1_send_routing_get, - put: snd_emu10k1_send_routing_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "EMU10K1 PCM Send Routing", + .info = snd_emu10k1_send_routing_info, + .get = snd_emu10k1_send_routing_get, + .put = snd_emu10k1_send_routing_put }; static int snd_emu10k1_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -269,12 +269,12 @@ static snd_kcontrol_new_t snd_emu10k1_send_volume_control = { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "EMU10K1 PCM Send Volume", - info: snd_emu10k1_send_volume_info, - get: snd_emu10k1_send_volume_get, - put: snd_emu10k1_send_volume_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "EMU10K1 PCM Send Volume", + .info = snd_emu10k1_send_volume_info, + .get = snd_emu10k1_send_volume_get, + .put = snd_emu10k1_send_volume_put }; static int snd_emu10k1_attn_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -331,12 +331,12 @@ static snd_kcontrol_new_t snd_emu10k1_attn_control = { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "EMU10K1 PCM Volume", - info: snd_emu10k1_attn_info, - get: snd_emu10k1_attn_get, - put: snd_emu10k1_attn_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "EMU10K1 PCM Volume", + .info = snd_emu10k1_attn_info, + .get = snd_emu10k1_attn_get, + .put = snd_emu10k1_attn_put }; static int snd_emu10k1_shared_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -393,20 +393,20 @@ static snd_kcontrol_new_t snd_emu10k1_shared_spdif __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "SB Live Analog/Digital Output Jack", - info: snd_emu10k1_shared_spdif_info, - get: snd_emu10k1_shared_spdif_get, - put: snd_emu10k1_shared_spdif_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "SB Live Analog/Digital Output Jack", + .info = snd_emu10k1_shared_spdif_info, + .get = snd_emu10k1_shared_spdif_get, + .put = snd_emu10k1_shared_spdif_put }; static snd_kcontrol_new_t snd_audigy_shared_spdif __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Audigy Analog/Digital Output Jack", - info: snd_emu10k1_shared_spdif_info, - get: snd_emu10k1_shared_spdif_get, - put: snd_emu10k1_shared_spdif_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Audigy Analog/Digital Output Jack", + .info = snd_emu10k1_shared_spdif_info, + .get = snd_emu10k1_shared_spdif_get, + .put = snd_emu10k1_shared_spdif_put }; /* diff -Nru a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c --- a/sound/pci/emu10k1/emumpu401.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/emu10k1/emumpu401.c Tue Oct 1 17:07:16 2002 @@ -287,16 +287,16 @@ static snd_rawmidi_ops_t snd_emu10k1_midi_output = { - open: snd_emu10k1_midi_output_open, - close: snd_emu10k1_midi_output_close, - trigger: snd_emu10k1_midi_output_trigger, + .open = snd_emu10k1_midi_output_open, + .close = snd_emu10k1_midi_output_close, + .trigger = snd_emu10k1_midi_output_trigger, }; static snd_rawmidi_ops_t snd_emu10k1_midi_input = { - open: snd_emu10k1_midi_input_open, - close: snd_emu10k1_midi_input_close, - trigger: snd_emu10k1_midi_input_trigger, + .open = snd_emu10k1_midi_input_open, + .close = snd_emu10k1_midi_input_close, + .trigger = snd_emu10k1_midi_input_trigger, }; static void snd_emu10k1_midi_free(snd_rawmidi_t *rmidi) diff -Nru a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c --- a/sound/pci/emu10k1/emupcm.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/emu10k1/emupcm.c Tue Oct 1 17:07:16 2002 @@ -141,9 +141,9 @@ }; static snd_pcm_hw_constraint_list_t hw_constraints_capture_period_sizes = { - count: 31, - list: capture_period_sizes, - mask: 0 + .count = 31, + .list = capture_period_sizes, + .mask = 0 }; static unsigned int capture_rates[8] = { @@ -151,9 +151,9 @@ }; static snd_pcm_hw_constraint_list_t hw_constraints_capture_rates = { - count: 8, - list: capture_rates, - mask: 0 + .count = 8, + .list = capture_rates, + .mask = 0 }; static unsigned int snd_emu10k1_capture_rate_reg(unsigned int rate) @@ -697,21 +697,21 @@ static snd_pcm_hardware_t snd_emu10k1_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE), - formats: SNDRV_PCM_FMTBIT_U8 | 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: 64, - period_bytes_max: (128*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | 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 = 64, + .period_bytes_max = (128*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; /* @@ -720,21 +720,21 @@ static snd_pcm_hardware_t snd_emu10k1_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: SNDRV_PCM_RATE_8000_48000, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: (64*1024), - period_bytes_min: 384, - period_bytes_max: (64*1024), - periods_min: 2, - periods_max: 2, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_8000_48000, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = (64*1024), + .period_bytes_min = 384, + .period_bytes_max = (64*1024), + .periods_min = 2, + .periods_max = 2, + .fifo_size = 0, }; /* @@ -945,28 +945,28 @@ } static snd_pcm_ops_t snd_emu10k1_playback_ops = { - open: snd_emu10k1_playback_open, - close: snd_emu10k1_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_emu10k1_playback_hw_params, - hw_free: snd_emu10k1_playback_hw_free, - prepare: snd_emu10k1_playback_prepare, - trigger: snd_emu10k1_playback_trigger, - pointer: snd_emu10k1_playback_pointer, - copy: snd_pcm_sgbuf_ops_copy_playback, - silence: snd_pcm_sgbuf_ops_silence, - page: snd_pcm_sgbuf_ops_page, + .open = snd_emu10k1_playback_open, + .close = snd_emu10k1_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_emu10k1_playback_hw_params, + .hw_free = snd_emu10k1_playback_hw_free, + .prepare = snd_emu10k1_playback_prepare, + .trigger = snd_emu10k1_playback_trigger, + .pointer = snd_emu10k1_playback_pointer, + .copy = snd_pcm_sgbuf_ops_copy_playback, + .silence = snd_pcm_sgbuf_ops_silence, + .page = snd_pcm_sgbuf_ops_page, }; static snd_pcm_ops_t snd_emu10k1_capture_ops = { - open: snd_emu10k1_capture_open, - close: snd_emu10k1_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_emu10k1_capture_hw_params, - hw_free: snd_emu10k1_capture_hw_free, - prepare: snd_emu10k1_capture_prepare, - trigger: snd_emu10k1_capture_trigger, - pointer: snd_emu10k1_capture_pointer, + .open = snd_emu10k1_capture_open, + .close = snd_emu10k1_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_emu10k1_capture_hw_params, + .hw_free = snd_emu10k1_capture_hw_free, + .prepare = snd_emu10k1_capture_prepare, + .trigger = snd_emu10k1_capture_trigger, + .pointer = snd_emu10k1_capture_pointer, }; static void snd_emu10k1_pcm_free(snd_pcm_t *pcm) @@ -1010,14 +1010,14 @@ } static snd_pcm_ops_t snd_emu10k1_capture_mic_ops = { - open: snd_emu10k1_capture_mic_open, - close: snd_emu10k1_capture_mic_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_emu10k1_capture_hw_params, - hw_free: snd_emu10k1_capture_hw_free, - prepare: snd_emu10k1_capture_prepare, - trigger: snd_emu10k1_capture_trigger, - pointer: snd_emu10k1_capture_pointer, + .open = snd_emu10k1_capture_mic_open, + .close = snd_emu10k1_capture_mic_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_emu10k1_capture_hw_params, + .hw_free = snd_emu10k1_capture_hw_free, + .prepare = snd_emu10k1_capture_prepare, + .trigger = snd_emu10k1_capture_trigger, + .pointer = snd_emu10k1_capture_pointer, }; static void snd_emu10k1_pcm_mic_free(snd_pcm_t *pcm) @@ -1105,22 +1105,22 @@ } static snd_kcontrol_new_t snd_emu10k1_pcm_efx_voices_mask = { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "EFX voices mask", - info: snd_emu10k1_pcm_efx_voices_mask_info, - get: snd_emu10k1_pcm_efx_voices_mask_get, - put: snd_emu10k1_pcm_efx_voices_mask_put + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "EFX voices mask", + .info = snd_emu10k1_pcm_efx_voices_mask_info, + .get = snd_emu10k1_pcm_efx_voices_mask_get, + .put = snd_emu10k1_pcm_efx_voices_mask_put }; static snd_pcm_ops_t snd_emu10k1_capture_efx_ops = { - open: snd_emu10k1_capture_efx_open, - close: snd_emu10k1_capture_efx_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_emu10k1_capture_hw_params, - hw_free: snd_emu10k1_capture_hw_free, - prepare: snd_emu10k1_capture_prepare, - trigger: snd_emu10k1_capture_trigger, - pointer: snd_emu10k1_capture_pointer, + .open = snd_emu10k1_capture_efx_open, + .close = snd_emu10k1_capture_efx_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_emu10k1_capture_hw_params, + .hw_free = snd_emu10k1_capture_hw_free, + .prepare = snd_emu10k1_capture_prepare, + .trigger = snd_emu10k1_capture_trigger, + .pointer = snd_emu10k1_capture_pointer, }; static void snd_emu10k1_pcm_efx_free(snd_pcm_t *pcm) diff -Nru a/sound/pci/es1968.c b/sound/pci/es1968.c --- a/sound/pci/es1968.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/es1968.c Tue Oct 1 17:07:16 2002 @@ -1752,26 +1752,26 @@ } static snd_pcm_ops_t snd_es1968_playback_ops = { - open: snd_es1968_playback_open, - close: snd_es1968_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_es1968_hw_params, - hw_free: snd_es1968_hw_free, - prepare: snd_es1968_pcm_prepare, - trigger: snd_es1968_pcm_trigger, - pointer: snd_es1968_pcm_pointer, + .open = snd_es1968_playback_open, + .close = snd_es1968_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_es1968_hw_params, + .hw_free = snd_es1968_hw_free, + .prepare = snd_es1968_pcm_prepare, + .trigger = snd_es1968_pcm_trigger, + .pointer = snd_es1968_pcm_pointer, }; static snd_pcm_ops_t snd_es1968_capture_ops = { - open: snd_es1968_capture_open, - close: snd_es1968_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_es1968_hw_params, - hw_free: snd_es1968_hw_free, - prepare: snd_es1968_pcm_prepare, - trigger: snd_es1968_pcm_trigger, - pointer: snd_es1968_pcm_pointer, - copy: snd_es1968_capture_copy, + .open = snd_es1968_capture_open, + .close = snd_es1968_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_es1968_hw_params, + .hw_free = snd_es1968_hw_free, + .prepare = snd_es1968_pcm_prepare, + .trigger = snd_es1968_pcm_trigger, + .pointer = snd_es1968_pcm_pointer, + .copy = snd_es1968_capture_copy, }; @@ -2529,7 +2529,7 @@ es1968_t **chip_ret) { static snd_device_ops_t ops = { - dev_free: snd_es1968_dev_free, + .dev_free = snd_es1968_dev_free, }; es1968_t *chip; int i, err; @@ -2654,11 +2654,11 @@ static snd_kcontrol_new_t snd_es1968_control_switches[] __devinitdata = { { - name: "Joystick", - iface: SNDRV_CTL_ELEM_IFACE_CARD, - info: snd_es1968_joystick_info, - get: snd_es1968_joystick_get, - put: snd_es1968_joystick_put, + .name = "Joystick", + .iface = SNDRV_CTL_ELEM_IFACE_CARD, + .info = snd_es1968_joystick_info, + .get = snd_es1968_joystick_get, + .put = snd_es1968_joystick_put, } }; @@ -2761,13 +2761,13 @@ } static struct pci_driver driver = { - name: "ES1968 (ESS Maestro)", - id_table: snd_es1968_ids, - probe: snd_es1968_probe, - remove: __devexit_p(snd_es1968_remove), + .name = "ES1968 (ESS Maestro)", + .id_table = snd_es1968_ids, + .probe = snd_es1968_probe, + .remove = __devexit_p(snd_es1968_remove), #ifdef CONFIG_PM - suspend: snd_es1968_suspend, - resume: snd_es1968_resume, + .suspend = snd_es1968_suspend, + .resume = snd_es1968_resume, #endif }; diff -Nru a/sound/pci/fm801.c b/sound/pci/fm801.c --- a/sound/pci/fm801.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/fm801.c Tue Oct 1 17:07:16 2002 @@ -270,9 +270,9 @@ #define RATES sizeof(rates) / sizeof(rates[0]) static snd_pcm_hw_constraint_list_t hw_constraints_rates = { - count: RATES, - list: rates, - mask: 0, + .count = RATES, + .list = rates, + .mask = 0, }; static unsigned int channels[] = { @@ -282,9 +282,9 @@ #define CHANNELS sizeof(channels) / sizeof(channels[0]) static snd_pcm_hw_constraint_list_t hw_constraints_channels = { - count: CHANNELS, - list: channels, - mask: 0, + .count = CHANNELS, + .list = channels, + .mask = 0, }; /* @@ -512,7 +512,7 @@ static snd_pcm_hardware_t snd_fm801_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, @@ -531,7 +531,7 @@ static snd_pcm_hardware_t snd_fm801_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, @@ -597,25 +597,25 @@ } static snd_pcm_ops_t snd_fm801_playback_ops = { - open: snd_fm801_playback_open, - close: snd_fm801_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_fm801_hw_params, - hw_free: snd_fm801_hw_free, - prepare: snd_fm801_playback_prepare, - trigger: snd_fm801_playback_trigger, - pointer: snd_fm801_playback_pointer, + .open = snd_fm801_playback_open, + .close = snd_fm801_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_fm801_hw_params, + .hw_free = snd_fm801_hw_free, + .prepare = snd_fm801_playback_prepare, + .trigger = snd_fm801_playback_trigger, + .pointer = snd_fm801_playback_pointer, }; static snd_pcm_ops_t snd_fm801_capture_ops = { - open: snd_fm801_capture_open, - close: snd_fm801_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_fm801_hw_params, - hw_free: snd_fm801_hw_free, - prepare: snd_fm801_capture_prepare, - trigger: snd_fm801_capture_trigger, - pointer: snd_fm801_capture_pointer, + .open = snd_fm801_capture_open, + .close = snd_fm801_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_fm801_hw_params, + .hw_free = snd_fm801_hw_free, + .prepare = snd_fm801_capture_prepare, + .trigger = snd_fm801_capture_trigger, + .pointer = snd_fm801_capture_pointer, }; static void snd_fm801_pcm_free(snd_pcm_t *pcm) @@ -656,9 +656,9 @@ */ #define FM801_SINGLE(xname, reg, shift, mask, invert) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_fm801_info_single, \ - get: snd_fm801_get_single, put: snd_fm801_put_single, \ - private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_fm801_info_single, \ + .get = snd_fm801_get_single, .put = snd_fm801_put_single, \ + .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) } static int snd_fm801_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -701,9 +701,9 @@ } #define FM801_DOUBLE(xname, reg, shift_left, shift_right, mask, invert) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_fm801_info_double, \ - get: snd_fm801_get_double, put: snd_fm801_put_double, \ - private_value: reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_fm801_info_double, \ + .get = snd_fm801_get_double, .put = snd_fm801_put_double, \ + .private_value = reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) } static int snd_fm801_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -804,11 +804,11 @@ FM801_DOUBLE("FM Playback Volume", FM801_FM_VOL, 0, 8, 31, 1), FM801_SINGLE("FM Playback Switch", FM801_FM_VOL, 15, 1, 1), { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Digital Capture Source", - info: snd_fm801_info_mux, - get: snd_fm801_get_mux, - put: snd_fm801_put_mux, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Digital Capture Source", + .info = snd_fm801_info_mux, + .get = snd_fm801_get_mux, + .put = snd_fm801_put_mux, } }; @@ -903,7 +903,7 @@ signed long timeout; int err; static snd_device_ops_t ops = { - dev_free: snd_fm801_dev_free, + .dev_free = snd_fm801_dev_free, }; *rchip = NULL; @@ -1091,10 +1091,10 @@ } static struct pci_driver driver = { - name: "FM801", - id_table: snd_fm801_ids, - probe: snd_card_fm801_probe, - remove: __devexit_p(snd_card_fm801_remove), + .name = "FM801", + .id_table = snd_fm801_ids, + .probe = snd_card_fm801_probe, + .remove = __devexit_p(snd_card_fm801_remove), }; static int __init alsa_card_fm801_init(void) diff -Nru a/sound/pci/ice1712.c b/sound/pci/ice1712.c --- a/sound/pci/ice1712.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/ice1712.c Tue Oct 1 17:07:16 2002 @@ -699,11 +699,11 @@ } static snd_kcontrol_new_t snd_ice1712_mixer_digmix_route_ac97 __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Digital Mixer To AC97", - info: snd_ice1712_digmix_route_ac97_info, - get: snd_ice1712_digmix_route_ac97_get, - put: snd_ice1712_digmix_route_ac97_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Digital Mixer To AC97", + .info = snd_ice1712_digmix_route_ac97_info, + .get = snd_ice1712_digmix_route_ac97_get, + .put = snd_ice1712_digmix_route_ac97_put, }; @@ -865,9 +865,9 @@ } static snd_i2c_ops_t ap_cs8427_i2c_ops = { - sendbytes: ap_cs8427_sendbytes, - readbytes: ap_cs8427_readbytes, - probeaddr: ap_cs8427_probeaddr, + .sendbytes = ap_cs8427_sendbytes, + .readbytes = ap_cs8427_readbytes, + .probeaddr = ap_cs8427_probeaddr, }; /* @@ -951,12 +951,12 @@ } static snd_i2c_bit_ops_t snd_ice1712_ewx_cs8427_bit_ops = { - start: ewx_i2c_start, - stop: ewx_i2c_stop, - direction: ewx_i2c_direction, - setlines: ewx_i2c_setlines, - getclock: ewx_i2c_getclock, - getdata: ewx_i2c_getdata, + .start = ewx_i2c_start, + .stop = ewx_i2c_stop, + .direction = ewx_i2c_direction, + .setlines = ewx_i2c_setlines, + .getclock = ewx_i2c_getclock, + .getdata = ewx_i2c_getdata, }; /* AK4524 chip select; address 0x48 bit 0-3 */ @@ -1538,61 +1538,61 @@ static snd_pcm_hardware_t snd_ice1712_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE), - formats: SNDRV_PCM_FMTBIT_U8 | 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: (64*1024), - period_bytes_min: 64, - period_bytes_max: (64*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | 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 = (64*1024), + .period_bytes_min = 64, + .period_bytes_max = (64*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_ice1712_playback_ds = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE), - formats: SNDRV_PCM_FMTBIT_U8 | 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: 64, - period_bytes_max: (128*1024), - periods_min: 2, - periods_max: 2, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | 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 = 64, + .period_bytes_max = (128*1024), + .periods_min = 2, + .periods_max = 2, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_ice1712_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_U8 | 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: (64*1024), - period_bytes_min: 64, - period_bytes_max: (64*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | 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 = (64*1024), + .period_bytes_min = 64, + .period_bytes_max = (64*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static int snd_ice1712_playback_open(snd_pcm_substream_t * substream) @@ -1667,36 +1667,36 @@ } static snd_pcm_ops_t snd_ice1712_playback_ops = { - open: snd_ice1712_playback_open, - close: snd_ice1712_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ice1712_hw_params, - hw_free: snd_ice1712_hw_free, - prepare: snd_ice1712_playback_prepare, - trigger: snd_ice1712_playback_trigger, - pointer: snd_ice1712_playback_pointer, + .open = snd_ice1712_playback_open, + .close = snd_ice1712_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ice1712_hw_params, + .hw_free = snd_ice1712_hw_free, + .prepare = snd_ice1712_playback_prepare, + .trigger = snd_ice1712_playback_trigger, + .pointer = snd_ice1712_playback_pointer, }; static snd_pcm_ops_t snd_ice1712_playback_ds_ops = { - open: snd_ice1712_playback_ds_open, - close: snd_ice1712_playback_ds_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ice1712_hw_params, - hw_free: snd_ice1712_hw_free, - prepare: snd_ice1712_playback_ds_prepare, - trigger: snd_ice1712_playback_ds_trigger, - pointer: snd_ice1712_playback_ds_pointer, + .open = snd_ice1712_playback_ds_open, + .close = snd_ice1712_playback_ds_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ice1712_hw_params, + .hw_free = snd_ice1712_hw_free, + .prepare = snd_ice1712_playback_ds_prepare, + .trigger = snd_ice1712_playback_ds_trigger, + .pointer = snd_ice1712_playback_ds_pointer, }; static snd_pcm_ops_t snd_ice1712_capture_ops = { - open: snd_ice1712_capture_open, - close: snd_ice1712_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ice1712_hw_params, - hw_free: snd_ice1712_hw_free, - prepare: snd_ice1712_capture_prepare, - trigger: snd_ice1712_capture_trigger, - pointer: snd_ice1712_capture_pointer, + .open = snd_ice1712_capture_open, + .close = snd_ice1712_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ice1712_hw_params, + .hw_free = snd_ice1712_hw_free, + .prepare = snd_ice1712_capture_prepare, + .trigger = snd_ice1712_capture_trigger, + .pointer = snd_ice1712_capture_pointer, }; static void snd_ice1712_pcm_free(snd_pcm_t *pcm) @@ -1780,9 +1780,9 @@ #define RATES sizeof(rates) / sizeof(rates[0]) static snd_pcm_hw_constraint_list_t hw_constraints_rates = { - count: RATES, - list: rates, - mask: 0, + .count = RATES, + .list = rates, + .mask = 0, }; #if 0 @@ -1980,42 +1980,42 @@ static snd_pcm_hardware_t snd_ice1712_playback_pro = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START), - formats: SNDRV_PCM_FMTBIT_S32_LE, - rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000, - rate_min: 4000, - rate_max: 96000, - channels_min: 10, - channels_max: 10, - buffer_bytes_max: (256*1024), - period_bytes_min: 10 * 4 * 2, - period_bytes_max: 131040, - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000, + .rate_min = 4000, + .rate_max = 96000, + .channels_min = 10, + .channels_max = 10, + .buffer_bytes_max = (256*1024), + .period_bytes_min = 10 * 4 * 2, + .period_bytes_max = 131040, + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_ice1712_capture_pro = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_SYNC_START), - formats: SNDRV_PCM_FMTBIT_S32_LE, - rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000, - rate_min: 4000, - rate_max: 96000, - channels_min: 12, - channels_max: 12, - buffer_bytes_max: (256*1024), - period_bytes_min: 12 * 4 * 2, - period_bytes_max: 131040, - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_96000, + .rate_min = 4000, + .rate_max = 96000, + .channels_min = 12, + .channels_max = 12, + .buffer_bytes_max = (256*1024), + .period_bytes_min = 12 * 4 * 2, + .period_bytes_max = 131040, + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static int snd_ice1712_playback_pro_open(snd_pcm_substream_t * substream) @@ -2076,25 +2076,25 @@ } static snd_pcm_ops_t snd_ice1712_playback_pro_ops = { - open: snd_ice1712_playback_pro_open, - close: snd_ice1712_playback_pro_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ice1712_hw_params, - hw_free: snd_ice1712_hw_free, - prepare: snd_ice1712_playback_pro_prepare, - trigger: snd_ice1712_pro_trigger, - pointer: snd_ice1712_playback_pro_pointer, + .open = snd_ice1712_playback_pro_open, + .close = snd_ice1712_playback_pro_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ice1712_hw_params, + .hw_free = snd_ice1712_hw_free, + .prepare = snd_ice1712_playback_pro_prepare, + .trigger = snd_ice1712_pro_trigger, + .pointer = snd_ice1712_playback_pro_pointer, }; static snd_pcm_ops_t snd_ice1712_capture_pro_ops = { - open: snd_ice1712_capture_pro_open, - close: snd_ice1712_capture_pro_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ice1712_hw_params, - hw_free: snd_ice1712_hw_free, - prepare: snd_ice1712_capture_pro_prepare, - trigger: snd_ice1712_pro_trigger, - pointer: snd_ice1712_capture_pro_pointer, + .open = snd_ice1712_capture_pro_open, + .close = snd_ice1712_capture_pro_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ice1712_hw_params, + .hw_free = snd_ice1712_hw_free, + .prepare = snd_ice1712_capture_pro_prepare, + .trigger = snd_ice1712_pro_trigger, + .pointer = snd_ice1712_capture_pro_pointer, }; static int __devinit snd_ice1712_pcm_profi(ice1712_t * ice, int device, snd_pcm_t ** rpcm) @@ -2531,11 +2531,11 @@ } static snd_kcontrol_new_t snd_ice1712_eeprom __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_CARD, - name: "ICE1712 EEPROM", - access: SNDRV_CTL_ELEM_ACCESS_READ, - info: snd_ice1712_eeprom_info, - get: snd_ice1712_eeprom_get + .iface = SNDRV_CTL_ELEM_IFACE_CARD, + .name = "ICE1712 EEPROM", + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .info = snd_ice1712_eeprom_info, + .get = snd_ice1712_eeprom_get }; /* @@ -2610,11 +2610,11 @@ static snd_kcontrol_new_t snd_ice1712_spdif_default __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - info: snd_ice1712_spdif_default_info, - get: snd_ice1712_spdif_default_get, - put: snd_ice1712_spdif_default_put + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), + .info = snd_ice1712_spdif_default_info, + .get = snd_ice1712_spdif_default_get, + .put = snd_ice1712_spdif_default_put }; static int snd_ice1712_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -2686,20 +2686,20 @@ static snd_kcontrol_new_t snd_ice1712_spdif_maskc __devinitdata = { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), - info: snd_ice1712_spdif_mask_info, - get: snd_ice1712_spdif_maskc_get, + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), + .info = snd_ice1712_spdif_mask_info, + .get = snd_ice1712_spdif_maskc_get, }; static snd_kcontrol_new_t snd_ice1712_spdif_maskp __devinitdata = { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), - info: snd_ice1712_spdif_mask_info, - get: snd_ice1712_spdif_maskp_get, + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), + .info = snd_ice1712_spdif_mask_info, + .get = snd_ice1712_spdif_maskp_get, }; static int snd_ice1712_spdif_stream_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -2772,18 +2772,18 @@ static snd_kcontrol_new_t snd_ice1712_spdif_stream __devinitdata = { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), - info: snd_ice1712_spdif_stream_info, - get: snd_ice1712_spdif_stream_get, - put: snd_ice1712_spdif_stream_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), + .info = snd_ice1712_spdif_stream_info, + .get = snd_ice1712_spdif_stream_get, + .put = snd_ice1712_spdif_stream_put }; #define ICE1712_GPIO(xiface, xname, xindex, mask, invert, xaccess) \ -{ iface: xiface, name: xname, access: xaccess, info: snd_ice1712_gpio_info, \ - get: snd_ice1712_gpio_get, put: snd_ice1712_gpio_put, \ - private_value: mask | (invert << 24) } +{ .iface = xiface, .name = xname, .access = xaccess, .info = snd_ice1712_gpio_info, \ + .get = snd_ice1712_gpio_get, .put = snd_ice1712_gpio_put, \ + .private_value = mask | (invert << 24) } static int snd_ice1712_gpio_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -2877,11 +2877,11 @@ } static snd_kcontrol_new_t snd_ice1712_pro_spdif_master __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Multi Track IEC958 Master", - info: snd_ice1712_pro_spdif_master_info, - get: snd_ice1712_pro_spdif_master_get, - put: snd_ice1712_pro_spdif_master_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Multi Track IEC958 Master", + .info = snd_ice1712_pro_spdif_master_info, + .get = snd_ice1712_pro_spdif_master_get, + .put = snd_ice1712_pro_spdif_master_put }; /* @@ -3028,19 +3028,19 @@ } static snd_kcontrol_new_t snd_ice1712_mixer_pro_analog_route __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "H/W Playback Route", - info: snd_ice1712_pro_route_info, - get: snd_ice1712_pro_route_analog_get, - put: snd_ice1712_pro_route_analog_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "H/W Playback Route", + .info = snd_ice1712_pro_route_info, + .get = snd_ice1712_pro_route_analog_get, + .put = snd_ice1712_pro_route_analog_put, }; static snd_kcontrol_new_t snd_ice1712_mixer_pro_spdif_route __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "IEC958 Playback Route", - info: snd_ice1712_pro_route_info, - get: snd_ice1712_pro_route_spdif_get, - put: snd_ice1712_pro_route_spdif_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "IEC958 Playback Route", + .info = snd_ice1712_pro_route_info, + .get = snd_ice1712_pro_route_spdif_get, + .put = snd_ice1712_pro_route_spdif_put, }; @@ -3078,11 +3078,11 @@ } static snd_kcontrol_new_t snd_ice1712_mixer_pro_volume_rate __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Multi Track Volume Rate", - info: snd_ice1712_pro_volume_rate_info, - get: snd_ice1712_pro_volume_rate_get, - put: snd_ice1712_pro_volume_rate_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Multi Track Volume Rate", + .info = snd_ice1712_pro_volume_rate_info, + .get = snd_ice1712_pro_volume_rate_get, + .put = snd_ice1712_pro_volume_rate_put }; static int snd_ice1712_pro_peak_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -3110,11 +3110,11 @@ } static snd_kcontrol_new_t snd_ice1712_mixer_pro_peak __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Multi Track Peak", - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, - info: snd_ice1712_pro_peak_info, - get: snd_ice1712_pro_peak_get + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Multi Track Peak", + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, + .info = snd_ice1712_pro_peak_info, + .get = snd_ice1712_pro_peak_get }; /* @@ -3166,21 +3166,21 @@ } static snd_kcontrol_new_t snd_ice1712_ewx_input_sense __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Input Sensitivity Switch", - info: snd_ice1712_ewx_io_sense_info, - get: snd_ice1712_ewx_io_sense_get, - put: snd_ice1712_ewx_io_sense_put, - private_value: ICE1712_EWX2496_AIN_SEL, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Input Sensitivity Switch", + .info = snd_ice1712_ewx_io_sense_info, + .get = snd_ice1712_ewx_io_sense_get, + .put = snd_ice1712_ewx_io_sense_put, + .private_value = ICE1712_EWX2496_AIN_SEL, }; static snd_kcontrol_new_t snd_ice1712_ewx_output_sense __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Output Sensitivity Switch", - info: snd_ice1712_ewx_io_sense_info, - get: snd_ice1712_ewx_io_sense_get, - put: snd_ice1712_ewx_io_sense_put, - private_value: ICE1712_EWX2496_AOUT_SEL, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Output Sensitivity Switch", + .info = snd_ice1712_ewx_io_sense_info, + .get = snd_ice1712_ewx_io_sense_get, + .put = snd_ice1712_ewx_io_sense_put, + .private_value = ICE1712_EWX2496_AOUT_SEL, }; @@ -3264,19 +3264,19 @@ } static snd_kcontrol_new_t snd_ice1712_ews88mt_input_sense __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Input Sensitivity Switch", - info: snd_ice1712_ewx_io_sense_info, - get: snd_ice1712_ews88mt_input_sense_get, - put: snd_ice1712_ews88mt_input_sense_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Input Sensitivity Switch", + .info = snd_ice1712_ewx_io_sense_info, + .get = snd_ice1712_ews88mt_input_sense_get, + .put = snd_ice1712_ews88mt_input_sense_put, }; static snd_kcontrol_new_t snd_ice1712_ews88mt_output_sense __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Output Sensitivity Switch", - info: snd_ice1712_ewx_io_sense_info, - get: snd_ice1712_ews88mt_output_sense_get, - put: snd_ice1712_ews88mt_output_sense_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Output Sensitivity Switch", + .info = snd_ice1712_ewx_io_sense_info, + .get = snd_ice1712_ews88mt_output_sense_get, + .put = snd_ice1712_ews88mt_output_sense_put, }; @@ -3344,13 +3344,13 @@ } #define EWS88D_CONTROL(xiface, xname, xshift, xinvert, xaccess) \ -{ iface: xiface,\ - name: xname,\ - access: xaccess,\ - info: snd_ice1712_ews88d_control_info,\ - get: snd_ice1712_ews88d_control_get,\ - put: snd_ice1712_ews88d_control_put,\ - private_value: xshift | (xinvert << 8),\ +{ .iface = xiface,\ + .name = xname,\ + .access = xaccess,\ + .info = snd_ice1712_ews88d_control_info,\ + .get = snd_ice1712_ews88d_control_get,\ + .put = snd_ice1712_ews88d_control_put,\ + .private_value = xshift | (xinvert << 8),\ } static snd_kcontrol_new_t snd_ice1712_ews88d_controls[] __devinitdata = { @@ -3442,13 +3442,13 @@ } #define DMX6FIRE_CONTROL(xiface, xname, xshift, xinvert, xaccess) \ -{ iface: xiface,\ - name: xname,\ - access: xaccess,\ - info: snd_ice1712_6fire_control_info,\ - get: snd_ice1712_6fire_control_get,\ - put: snd_ice1712_6fire_control_put,\ - private_value: xshift | (xinvert << 8),\ +{ .iface = xiface,\ + .name = xname,\ + .access = xaccess,\ + .info = snd_ice1712_6fire_control_info,\ + .get = snd_ice1712_6fire_control_get,\ + .put = snd_ice1712_6fire_control_put,\ + .private_value = xshift | (xinvert << 8),\ } static snd_kcontrol_new_t snd_ice1712_6fire_led __devinitdata = @@ -4123,7 +4123,7 @@ ice1712_t *ice; int err; static snd_device_ops_t ops = { - dev_free: snd_ice1712_dev_free, + .dev_free = snd_ice1712_dev_free, }; *r_ice1712 = NULL; @@ -4339,10 +4339,10 @@ } static struct pci_driver driver = { - name: "ICE1712", - id_table: snd_ice1712_ids, - probe: snd_ice1712_probe, - remove: __devexit_p(snd_ice1712_remove), + .name = "ICE1712", + .id_table = snd_ice1712_ids, + .probe = snd_ice1712_probe, + .remove = __devexit_p(snd_ice1712_remove), }; static int __init alsa_card_ice1712_init(void) diff -Nru a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c --- a/sound/pci/intel8x0.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/intel8x0.c Tue Oct 1 17:07:16 2002 @@ -617,43 +617,43 @@ static snd_pcm_hardware_t snd_intel8x0_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: 0, - rate_min: 8000, - rate_max: 48000, - channels_min: 2, - channels_max: 2, - buffer_bytes_max: 128 * 1024, - period_bytes_min: 32, - period_bytes_max: 128 * 1024, - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = 0, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 128 * 1024, + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_intel8x0_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_RESUME), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: 0, - rate_min: 8000, - rate_max: 48000, - channels_min: 2, - channels_max: 2, - buffer_bytes_max: 128 * 1024, - period_bytes_min: 32, - period_bytes_max: 128 * 1024, - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = 0, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 128 * 1024, + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static unsigned int channels4[] = { @@ -663,9 +663,9 @@ #define CHANNELS4 sizeof(channels4) / sizeof(channels4[0]) static snd_pcm_hw_constraint_list_t hw_constraints_channels4 = { - count: CHANNELS4, - list: channels4, - mask: 0, + .count = CHANNELS4, + .list = channels4, + .mask = 0, }; static unsigned int channels6[] = { @@ -675,9 +675,9 @@ #define CHANNELS6 sizeof(channels6) / sizeof(channels6[0]) static snd_pcm_hw_constraint_list_t hw_constraints_channels6 = { - count: CHANNELS6, - list: channels6, - mask: 0, + .count = CHANNELS6, + .list = channels6, + .mask = 0, }; static int snd_intel8x0_playback_open(snd_pcm_substream_t * substream) @@ -748,25 +748,25 @@ } static snd_pcm_ops_t snd_intel8x0_playback_ops = { - open: snd_intel8x0_playback_open, - close: snd_intel8x0_playback_close, - ioctl: snd_intel8x0_playback_ioctl, - hw_params: snd_intel8x0_hw_params, - hw_free: snd_intel8x0_hw_free, - prepare: snd_intel8x0_playback_prepare, - trigger: snd_intel8x0_playback_trigger, - pointer: snd_intel8x0_playback_pointer, + .open = snd_intel8x0_playback_open, + .close = snd_intel8x0_playback_close, + .ioctl = snd_intel8x0_playback_ioctl, + .hw_params = snd_intel8x0_hw_params, + .hw_free = snd_intel8x0_hw_free, + .prepare = snd_intel8x0_playback_prepare, + .trigger = snd_intel8x0_playback_trigger, + .pointer = snd_intel8x0_playback_pointer, }; static snd_pcm_ops_t snd_intel8x0_capture_ops = { - open: snd_intel8x0_capture_open, - close: snd_intel8x0_capture_close, - ioctl: snd_intel8x0_capture_ioctl, - hw_params: snd_intel8x0_hw_params, - hw_free: snd_intel8x0_hw_free, - prepare: snd_intel8x0_capture_prepare, - trigger: snd_intel8x0_capture_trigger, - pointer: snd_intel8x0_capture_pointer, + .open = snd_intel8x0_capture_open, + .close = snd_intel8x0_capture_close, + .ioctl = snd_intel8x0_capture_ioctl, + .hw_params = snd_intel8x0_hw_params, + .hw_free = snd_intel8x0_hw_free, + .prepare = snd_intel8x0_capture_prepare, + .trigger = snd_intel8x0_capture_trigger, + .pointer = snd_intel8x0_capture_pointer, }; static void snd_intel8x0_pcm_free(snd_pcm_t *pcm) @@ -855,22 +855,22 @@ static snd_pcm_hardware_t snd_intel8x0_capture_mic = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: 0, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 1, - buffer_bytes_max: 128 * 1024, - period_bytes_min: 32, - period_bytes_max: 128 * 1024, - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = 0, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 1, + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 128 * 1024, + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static int snd_intel8x0_capture_mic_open(snd_pcm_substream_t * substream) @@ -901,14 +901,14 @@ } static snd_pcm_ops_t snd_intel8x0_capture_mic_ops = { - open: snd_intel8x0_capture_mic_open, - close: snd_intel8x0_capture_mic_close, - ioctl: snd_intel8x0_capture_mic_ioctl, - hw_params: snd_intel8x0_hw_params, - hw_free: snd_intel8x0_hw_free, - prepare: snd_intel8x0_capture_mic_prepare, - trigger: snd_intel8x0_capture_mic_trigger, - pointer: snd_intel8x0_capture_mic_pointer, + .open = snd_intel8x0_capture_mic_open, + .close = snd_intel8x0_capture_mic_close, + .ioctl = snd_intel8x0_capture_mic_ioctl, + .hw_params = snd_intel8x0_hw_params, + .hw_free = snd_intel8x0_hw_free, + .prepare = snd_intel8x0_capture_mic_prepare, + .trigger = snd_intel8x0_capture_mic_trigger, + .pointer = snd_intel8x0_capture_mic_pointer, }; static void snd_intel8x0_pcm_mic_free(snd_pcm_t *pcm) @@ -1308,7 +1308,7 @@ intel8x0_t *chip; int err; static snd_device_ops_t ops = { - dev_free: snd_intel8x0_dev_free, + .dev_free = snd_intel8x0_dev_free, }; *r_intel8x0 = NULL; @@ -1510,7 +1510,7 @@ } static struct pci_driver driver = { - name: "Intel ICH", + .name = "Intel ICH", id_table: snd_intel8x0_ids, probe: snd_intel8x0_probe, remove: __devexit_p(snd_intel8x0_remove), @@ -1572,9 +1572,9 @@ }; static struct pci_driver joystick_driver = { - name: "Intel ICH Joystick", - id_table: snd_intel8x0_joystick_ids, - probe: snd_intel8x0_joystick_probe, + .name = "Intel ICH Joystick", + .id_table = snd_intel8x0_joystick_ids, + .probe = snd_intel8x0_joystick_probe, }; #endif diff -Nru a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c --- a/sound/pci/korg1212/korg1212.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/korg1212/korg1212.c Tue Oct 1 17:07:16 2002 @@ -1162,42 +1162,42 @@ static snd_pcm_hardware_t snd_korg1212_playback_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: (SNDRV_PCM_RATE_44100 | + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000), - rate_min: 44100, - rate_max: 48000, - channels_min: K1212_CHANNELS, - channels_max: K1212_CHANNELS, - buffer_bytes_max: K1212_BUF_SIZE, - period_bytes_min: K1212_PERIOD_BYTES, - period_bytes_max: K1212_PERIOD_BYTES, - periods_min: K1212_PERIODS, - periods_max: K1212_PERIODS, - fifo_size: 0, + .rate_min = 44100, + .rate_max = 48000, + .channels_min = K1212_CHANNELS, + .channels_max = K1212_CHANNELS, + .buffer_bytes_max = K1212_BUF_SIZE, + .period_bytes_min = K1212_PERIOD_BYTES, + .period_bytes_max = K1212_PERIOD_BYTES, + .periods_min = K1212_PERIODS, + .periods_max = K1212_PERIODS, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_korg1212_capture_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: (SNDRV_PCM_RATE_44100 | + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000), - rate_min: 44100, - rate_max: 48000, - channels_min: K1212_CHANNELS, - channels_max: K1212_CHANNELS, - buffer_bytes_max: K1212_BUF_SIZE, - period_bytes_min: K1212_PERIOD_BYTES, - period_bytes_max: K1212_PERIOD_BYTES, - periods_min: K1212_PERIODS, - periods_max: K1212_PERIODS, - fifo_size: 0, + .rate_min = 44100, + .rate_max = 48000, + .channels_min = K1212_CHANNELS, + .channels_max = K1212_CHANNELS, + .buffer_bytes_max = K1212_BUF_SIZE, + .period_bytes_min = K1212_PERIOD_BYTES, + .period_bytes_max = K1212_PERIOD_BYTES, + .periods_min = K1212_PERIODS, + .periods_max = K1212_PERIODS, + .fifo_size = 0, }; static void snd_korg1212_free_pcm(snd_pcm_t *pcm) @@ -1216,9 +1216,9 @@ #define PERIOD_BYTES sizeof(period_bytes) / sizeof(period_bytes[0]) static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = { - count: PERIOD_BYTES, - list: period_bytes, - mask: 0 + .count = PERIOD_BYTES, + .list = period_bytes, + .mask = 0 }; static int snd_korg1212_playback_open(snd_pcm_substream_t *substream) @@ -1504,26 +1504,26 @@ } static snd_pcm_ops_t snd_korg1212_playback_ops = { - open: snd_korg1212_playback_open, - close: snd_korg1212_playback_close, - ioctl: snd_korg1212_ioctl, - hw_params: snd_korg1212_hw_params, - prepare: snd_korg1212_prepare, - trigger: snd_korg1212_trigger, - pointer: snd_korg1212_pointer, - copy: snd_korg1212_playback_copy, - silence: snd_korg1212_playback_silence, + .open = snd_korg1212_playback_open, + .close = snd_korg1212_playback_close, + .ioctl = snd_korg1212_ioctl, + .hw_params = snd_korg1212_hw_params, + .prepare = snd_korg1212_prepare, + .trigger = snd_korg1212_trigger, + .pointer = snd_korg1212_pointer, + .copy = snd_korg1212_playback_copy, + .silence = snd_korg1212_playback_silence, }; static snd_pcm_ops_t snd_korg1212_capture_ops = { - open: snd_korg1212_capture_open, - close: snd_korg1212_capture_close, - ioctl: snd_korg1212_ioctl, - hw_params: snd_korg1212_hw_params, - prepare: snd_korg1212_prepare, - trigger: snd_korg1212_trigger, - pointer: snd_korg1212_pointer, - copy: snd_korg1212_capture_copy, + .open = snd_korg1212_capture_open, + .close = snd_korg1212_capture_close, + .ioctl = snd_korg1212_ioctl, + .hw_params = snd_korg1212_hw_params, + .prepare = snd_korg1212_prepare, + .trigger = snd_korg1212_trigger, + .pointer = snd_korg1212_pointer, + .copy = snd_korg1212_capture_copy, }; /* @@ -1803,31 +1803,31 @@ #define MON_MIXER(ord,c_name) \ { \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, \ - iface: SNDRV_CTL_ELEM_IFACE_MIXER, \ - name: c_name " Monitor Volume", \ - info: snd_korg1212_control_volume_info, \ - get: snd_korg1212_control_volume_get, \ - put: snd_korg1212_control_volume_put, \ - private_value: ord, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, \ + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = c_name " Monitor Volume", \ + .info = snd_korg1212_control_volume_info, \ + .get = snd_korg1212_control_volume_get, \ + .put = snd_korg1212_control_volume_put, \ + .private_value = ord, \ }, \ { \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, \ - iface: SNDRV_CTL_ELEM_IFACE_MIXER, \ - name: c_name " Monitor Route", \ - info: snd_korg1212_control_route_info, \ - get: snd_korg1212_control_route_get, \ - put: snd_korg1212_control_route_put, \ - private_value: ord, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, \ + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = c_name " Monitor Route", \ + .info = snd_korg1212_control_route_info, \ + .get = snd_korg1212_control_route_get, \ + .put = snd_korg1212_control_route_put, \ + .private_value = ord, \ }, \ { \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, \ - iface: SNDRV_CTL_ELEM_IFACE_PCM, \ - name: c_name " Monitor Phase Invert", \ - info: snd_korg1212_control_phase_info, \ - get: snd_korg1212_control_phase_get, \ - put: snd_korg1212_control_phase_put, \ - private_value: ord, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, \ + .iface = SNDRV_CTL_ELEM_IFACE_PCM, \ + .name = c_name " Monitor Phase Invert", \ + .info = snd_korg1212_control_phase_info, \ + .get = snd_korg1212_control_phase_get, \ + .put = snd_korg1212_control_phase_put, \ + .private_value = ord, \ } static snd_kcontrol_new_t snd_korg1212_controls[] = { @@ -1836,20 +1836,20 @@ MON_MIXER(0, "ADAT-1"), MON_MIXER(1, "ADAT-2"), MON_MIXER(2, "ADAT-3"), MON_MIXER(3, "ADAT-4"), MON_MIXER(4, "ADAT-5"), MON_MIXER(5, "ADAT-6"), MON_MIXER(6, "ADAT-7"), MON_MIXER(7, "ADAT-8"), { - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Sync Source", - info: snd_korg1212_control_sync_info, - get: snd_korg1212_control_sync_get, - put: snd_korg1212_control_sync_put, + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Sync Source", + .info = snd_korg1212_control_sync_info, + .get = snd_korg1212_control_sync_get, + .put = snd_korg1212_control_sync_put, }, { - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "ADC Attenuation", - info: snd_korg1212_control_analog_info, - get: snd_korg1212_control_analog_get, - put: snd_korg1212_control_analog_put, + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "ADC Attenuation", + .info = snd_korg1212_control_analog_info, + .get = snd_korg1212_control_analog_get, + .put = snd_korg1212_control_analog_put, } }; @@ -2305,10 +2305,10 @@ } static struct pci_driver driver = { - name: "korg1212", - id_table: snd_korg1212_ids, - probe: snd_korg1212_probe, - remove: __devexit_p(snd_korg1212_remove), + .name = "korg1212", + .id_table = snd_korg1212_ids, + .probe = snd_korg1212_probe, + .remove = __devexit_p(snd_korg1212_remove), }; static int __init alsa_card_korg1212_init(void) diff -Nru a/sound/pci/maestro3.c b/sound/pci/maestro3.c --- a/sound/pci/maestro3.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/maestro3.c Tue Oct 1 17:07:16 2002 @@ -1736,25 +1736,25 @@ */ static snd_pcm_ops_t snd_m3_playback_ops = { - open: snd_m3_playback_open, - close: snd_m3_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_m3_pcm_hw_params, - hw_free: snd_m3_pcm_hw_free, - prepare: snd_m3_pcm_prepare, - trigger: snd_m3_pcm_trigger, - pointer: snd_m3_pcm_pointer, + .open = snd_m3_playback_open, + .close = snd_m3_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_m3_pcm_hw_params, + .hw_free = snd_m3_pcm_hw_free, + .prepare = snd_m3_pcm_prepare, + .trigger = snd_m3_pcm_trigger, + .pointer = snd_m3_pcm_pointer, }; static snd_pcm_ops_t snd_m3_capture_ops = { - open: snd_m3_capture_open, - close: snd_m3_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_m3_pcm_hw_params, - hw_free: snd_m3_pcm_hw_free, - prepare: snd_m3_pcm_prepare, - trigger: snd_m3_pcm_trigger, - pointer: snd_m3_pcm_pointer, + .open = snd_m3_capture_open, + .close = snd_m3_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_m3_pcm_hw_params, + .hw_free = snd_m3_pcm_hw_free, + .prepare = snd_m3_pcm_prepare, + .trigger = snd_m3_pcm_trigger, + .pointer = snd_m3_pcm_pointer, }; static int __devinit @@ -2503,7 +2503,7 @@ struct m3_quirk *quirk; u16 subsystem_vendor, subsystem_device; static snd_device_ops_t ops = { - dev_free: snd_m3_dev_free, + .dev_free = snd_m3_dev_free, }; *chip_ret = NULL; @@ -2706,13 +2706,13 @@ } static struct pci_driver driver = { - name: "Maestro3", - id_table: snd_m3_ids, - probe: snd_m3_probe, - remove: __devexit_p(snd_m3_remove), + .name = "Maestro3", + .id_table = snd_m3_ids, + .probe = snd_m3_probe, + .remove = __devexit_p(snd_m3_remove), #ifdef CONFIG_PM - suspend: snd_m3_suspend, - resume: snd_m3_resume, + .suspend = snd_m3_suspend, + .resume = snd_m3_resume, #endif }; diff -Nru a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c --- a/sound/pci/nm256/nm256.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/nm256/nm256.c Tue Oct 1 17:07:16 2002 @@ -410,9 +410,9 @@ }; #define NUM_SAMPLERATES (sizeof(samplerates) / sizeof(samplerates[0])) static snd_pcm_hw_constraint_list_t constraints_rates = { - count: NUM_SAMPLERATES, - list: samplerates, - mask: 0, + .count = NUM_SAMPLERATES, + .list = samplerates, + .mask = 0, }; /* @@ -866,29 +866,29 @@ * create a pcm instance */ static snd_pcm_ops_t snd_nm256_playback_ops = { - open: snd_nm256_playback_open, - close: snd_nm256_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_nm256_pcm_hw_params, - prepare: snd_nm256_pcm_prepare, - trigger: snd_nm256_playback_trigger, - pointer: snd_nm256_playback_pointer, + .open = snd_nm256_playback_open, + .close = snd_nm256_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_nm256_pcm_hw_params, + .prepare = snd_nm256_pcm_prepare, + .trigger = snd_nm256_playback_trigger, + .pointer = snd_nm256_playback_pointer, #ifndef __i386__ - copy: snd_nm256_playback_copy, - silence: snd_nm256_playback_silence, + .copy = snd_nm256_playback_copy, + .silence = snd_nm256_playback_silence, #endif }; static snd_pcm_ops_t snd_nm256_capture_ops = { - open: snd_nm256_capture_open, - close: snd_nm256_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_nm256_pcm_hw_params, - prepare: snd_nm256_pcm_prepare, - trigger: snd_nm256_capture_trigger, - pointer: snd_nm256_capture_pointer, + .open = snd_nm256_capture_open, + .close = snd_nm256_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_nm256_pcm_hw_params, + .prepare = snd_nm256_pcm_prepare, + .trigger = snd_nm256_capture_trigger, + .pointer = snd_nm256_capture_pointer, #ifndef __i386__ - copy: snd_nm256_capture_copy, + .copy = snd_nm256_capture_copy, #endif }; @@ -1395,7 +1395,7 @@ nm256_t *chip; int err, pval; static snd_device_ops_t ops = { - dev_free: snd_nm256_dev_free, + .dev_free = snd_nm256_dev_free, }; u32 addr; @@ -1646,13 +1646,13 @@ static struct pci_driver driver = { - name: "NeoMagic 256", - id_table: snd_nm256_ids, - probe: snd_nm256_probe, - remove: __devexit_p(snd_nm256_remove), + .name = "NeoMagic 256", + .id_table = snd_nm256_ids, + .probe = snd_nm256_probe, + .remove = __devexit_p(snd_nm256_remove), #ifdef CONFIG_PM - suspend: snd_nm256_suspend, - resume: snd_nm256_resume, + .suspend = snd_nm256_suspend, + .resume = snd_nm256_resume, #endif }; diff -Nru a/sound/pci/rme32.c b/sound/pci/rme32.c --- a/sound/pci/rme32.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/rme32.c Tue Oct 1 17:07:16 2002 @@ -284,7 +284,7 @@ * Digital output capabilites (S/PDIF) */ static snd_pcm_hardware_t snd_rme32_playback_spdif_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), @@ -309,7 +309,7 @@ * Digital input capabilites (S/PDIF) */ static snd_pcm_hardware_t snd_rme32_capture_spdif_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), formats: (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE), @@ -332,7 +332,7 @@ */ static snd_pcm_hardware_t snd_rme32_playback_adat_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), @@ -356,7 +356,7 @@ */ static snd_pcm_hardware_t snd_rme32_capture_adat_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), @@ -793,9 +793,9 @@ #define PERIOD_BYTES sizeof(period_bytes) / sizeof(period_bytes[0]) static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = { - count:PERIOD_BYTES, - list:period_bytes, - mask:0 + .count = PERIOD_BYTES, + .list = period_bytes, + .mask = 0 }; static int snd_rme32_playback_spdif_open(snd_pcm_substream_t * substream) @@ -1142,53 +1142,53 @@ } static snd_pcm_ops_t snd_rme32_playback_spdif_ops = { - open: snd_rme32_playback_spdif_open, - close: snd_rme32_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme32_playback_hw_params, - hw_free: snd_rme32_playback_hw_free, - prepare: snd_rme32_playback_prepare, - trigger: snd_rme32_playback_trigger, - pointer: snd_rme32_playback_pointer, - copy: snd_rme32_playback_copy, - silence: snd_rme32_playback_silence, + .open = snd_rme32_playback_spdif_open, + .close = snd_rme32_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme32_playback_hw_params, + .hw_free = snd_rme32_playback_hw_free, + .prepare = snd_rme32_playback_prepare, + .trigger = snd_rme32_playback_trigger, + .pointer = snd_rme32_playback_pointer, + .copy = snd_rme32_playback_copy, + .silence = snd_rme32_playback_silence, }; static snd_pcm_ops_t snd_rme32_capture_spdif_ops = { - open: snd_rme32_capture_spdif_open, - close: snd_rme32_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme32_capture_hw_params, - hw_free: snd_rme32_capture_hw_free, - prepare: snd_rme32_capture_prepare, - trigger: snd_rme32_capture_trigger, - pointer: snd_rme32_capture_pointer, - copy: snd_rme32_capture_copy, + .open = snd_rme32_capture_spdif_open, + .close = snd_rme32_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme32_capture_hw_params, + .hw_free = snd_rme32_capture_hw_free, + .prepare = snd_rme32_capture_prepare, + .trigger = snd_rme32_capture_trigger, + .pointer = snd_rme32_capture_pointer, + .copy = snd_rme32_capture_copy, }; static snd_pcm_ops_t snd_rme32_playback_adat_ops = { - open: snd_rme32_playback_adat_open, - close: snd_rme32_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme32_playback_hw_params, - hw_free: snd_rme32_playback_hw_free, - prepare: snd_rme32_playback_prepare, - trigger: snd_rme32_playback_trigger, - pointer: snd_rme32_playback_pointer, - copy: snd_rme32_playback_copy, - silence: snd_rme32_playback_silence, + .open = snd_rme32_playback_adat_open, + .close = snd_rme32_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme32_playback_hw_params, + .hw_free = snd_rme32_playback_hw_free, + .prepare = snd_rme32_playback_prepare, + .trigger = snd_rme32_playback_trigger, + .pointer = snd_rme32_playback_pointer, + .copy = snd_rme32_playback_copy, + .silence = snd_rme32_playback_silence, }; static snd_pcm_ops_t snd_rme32_capture_adat_ops = { - open: snd_rme32_capture_adat_open, - close: snd_rme32_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme32_capture_hw_params, - hw_free: snd_rme32_capture_hw_free, - prepare: snd_rme32_capture_prepare, - trigger: snd_rme32_capture_trigger, - pointer: snd_rme32_capture_pointer, - copy: snd_rme32_capture_copy, + .open = snd_rme32_capture_adat_open, + .close = snd_rme32_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme32_capture_hw_params, + .hw_free = snd_rme32_capture_hw_free, + .prepare = snd_rme32_capture_prepare, + .trigger = snd_rme32_capture_trigger, + .pointer = snd_rme32_capture_pointer, + .copy = snd_rme32_capture_copy, }; static void snd_rme32_free(void *private_data) @@ -1760,56 +1760,56 @@ static snd_kcontrol_new_t snd_rme32_controls[] = { { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT), - info: snd_rme32_control_spdif_info, - get: snd_rme32_control_spdif_get, - put: snd_rme32_control_spdif_put + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT), + .info = snd_rme32_control_spdif_info, + .get = snd_rme32_control_spdif_get, + .put = snd_rme32_control_spdif_put }, { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("", PLAYBACK, PCM_STREAM), - info: snd_rme32_control_spdif_stream_info, - get: snd_rme32_control_spdif_stream_get, - put: snd_rme32_control_spdif_stream_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, PCM_STREAM), + .info = snd_rme32_control_spdif_stream_info, + .get = snd_rme32_control_spdif_stream_get, + .put = snd_rme32_control_spdif_stream_put }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK), - info: snd_rme32_control_spdif_mask_info, - get: snd_rme32_control_spdif_mask_get, - private_value: IEC958_AES0_PROFESSIONAL | IEC958_AES0_CON_EMPHASIS + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, CON_MASK), + .info = snd_rme32_control_spdif_mask_info, + .get = snd_rme32_control_spdif_mask_get, + .private_value = IEC958_AES0_PROFESSIONAL | IEC958_AES0_CON_EMPHASIS }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK), - info: snd_rme32_control_spdif_mask_info, - get: snd_rme32_control_spdif_mask_get, - private_value: IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, PRO_MASK), + .info = snd_rme32_control_spdif_mask_info, + .get = snd_rme32_control_spdif_mask_get, + .private_value = IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Input Connector", - info: snd_rme32_info_inputtype_control, - get: snd_rme32_get_inputtype_control, - put: snd_rme32_put_inputtype_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Input Connector", + .info = snd_rme32_info_inputtype_control, + .get = snd_rme32_get_inputtype_control, + .put = snd_rme32_put_inputtype_control }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Loopback Input", - info: snd_rme32_info_loopback_control, - get: snd_rme32_get_loopback_control, - put: snd_rme32_put_loopback_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Loopback Input", + .info = snd_rme32_info_loopback_control, + .get = snd_rme32_get_loopback_control, + .put = snd_rme32_put_loopback_control }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Clock Mode", - info: snd_rme32_info_clockmode_control, - get: snd_rme32_get_clockmode_control, - put: snd_rme32_put_clockmode_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Clock Mode", + .info = snd_rme32_info_clockmode_control, + .get = snd_rme32_get_clockmode_control, + .put = snd_rme32_put_clockmode_control } }; @@ -1898,10 +1898,10 @@ } static struct pci_driver driver = { - name: "RME Digi32", - id_table: snd_rme32_ids, - probe: snd_rme32_probe, - remove: __devexit_p(snd_rme32_remove), + .name = "RME Digi32", + .id_table = snd_rme32_ids, + .probe = snd_rme32_probe, + .remove = __devexit_p(snd_rme32_remove), }; static int __init alsa_card_rme32_init(void) diff -Nru a/sound/pci/rme96.c b/sound/pci/rme96.c --- a/sound/pci/rme96.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/rme96.c Tue Oct 1 17:07:16 2002 @@ -375,28 +375,28 @@ */ static snd_pcm_hardware_t snd_rme96_playback_spdif_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), - formats: (SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE), - rates: (SNDRV_PCM_RATE_32000 | + .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000), - rate_min: 32000, - rate_max: 96000, - channels_min: 2, - channels_max: 2, - buffer_bytes_max: RME96_BUFFER_SIZE, - period_bytes_min: RME96_SMALL_BLOCK_SIZE, - period_bytes_max: RME96_LARGE_BLOCK_SIZE, - periods_min: RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, - periods_max: RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, - fifo_size: 0, + .rate_min = 32000, + .rate_max = 96000, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = RME96_BUFFER_SIZE, + .period_bytes_min = RME96_SMALL_BLOCK_SIZE, + .period_bytes_max = RME96_LARGE_BLOCK_SIZE, + .periods_min = RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, + .periods_max = RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, + .fifo_size = 0, }; /* @@ -404,28 +404,28 @@ */ static snd_pcm_hardware_t snd_rme96_capture_spdif_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), - formats: (SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE), - rates: (SNDRV_PCM_RATE_32000 | + .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000), - rate_min: 32000, - rate_max: 96000, - channels_min: 2, - channels_max: 2, - buffer_bytes_max: RME96_BUFFER_SIZE, - period_bytes_min: RME96_SMALL_BLOCK_SIZE, - period_bytes_max: RME96_LARGE_BLOCK_SIZE, - periods_min: RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, - periods_max: RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, - fifo_size: 0, + .rate_min = 32000, + .rate_max = 96000, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = RME96_BUFFER_SIZE, + .period_bytes_min = RME96_SMALL_BLOCK_SIZE, + .period_bytes_max = RME96_LARGE_BLOCK_SIZE, + .periods_min = RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, + .periods_max = RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, + .fifo_size = 0, }; /* @@ -433,24 +433,24 @@ */ static snd_pcm_hardware_t snd_rme96_playback_adat_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), - formats: (SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE), - rates: (SNDRV_PCM_RATE_44100 | + .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000), - rate_min: 44100, - rate_max: 48000, - channels_min: 8, - channels_max: 8, - buffer_bytes_max: RME96_BUFFER_SIZE, - period_bytes_min: RME96_SMALL_BLOCK_SIZE, - period_bytes_max: RME96_LARGE_BLOCK_SIZE, - periods_min: RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, - periods_max: RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, - fifo_size: 0, + .rate_min = 44100, + .rate_max = 48000, + .channels_min = 8, + .channels_max = 8, + .buffer_bytes_max = RME96_BUFFER_SIZE, + .period_bytes_min = RME96_SMALL_BLOCK_SIZE, + .period_bytes_max = RME96_LARGE_BLOCK_SIZE, + .periods_min = RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, + .periods_max = RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, + .fifo_size = 0, }; /* @@ -458,24 +458,24 @@ */ static snd_pcm_hardware_t snd_rme96_capture_adat_info = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_PAUSE), - formats: (SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE), - rates: (SNDRV_PCM_RATE_44100 | + .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000), - rate_min: 44100, - rate_max: 48000, - channels_min: 8, - channels_max: 8, - buffer_bytes_max: RME96_BUFFER_SIZE, - period_bytes_min: RME96_SMALL_BLOCK_SIZE, - period_bytes_max: RME96_LARGE_BLOCK_SIZE, - periods_min: RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, - periods_max: RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, - fifo_size: 0, + .rate_min = 44100, + .rate_max = 48000, + .channels_min = 8, + .channels_max = 8, + .buffer_bytes_max = RME96_BUFFER_SIZE, + .period_bytes_min = RME96_SMALL_BLOCK_SIZE, + .period_bytes_max = RME96_LARGE_BLOCK_SIZE, + .periods_min = RME96_BUFFER_SIZE / RME96_LARGE_BLOCK_SIZE, + .periods_max = RME96_BUFFER_SIZE / RME96_SMALL_BLOCK_SIZE, + .fifo_size = 0, }; /* @@ -1150,9 +1150,9 @@ #define PERIOD_BYTES sizeof(period_bytes) / sizeof(period_bytes[0]) static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = { - count: PERIOD_BYTES, - list: period_bytes, - mask: 0 + .count = PERIOD_BYTES, + .list = period_bytes, + .mask = 0 }; static int @@ -1493,53 +1493,53 @@ } static snd_pcm_ops_t snd_rme96_playback_spdif_ops = { - open: snd_rme96_playback_spdif_open, - close: snd_rme96_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme96_playback_hw_params, - hw_free: snd_rme96_playback_hw_free, - prepare: snd_rme96_playback_prepare, - trigger: snd_rme96_playback_trigger, - pointer: snd_rme96_playback_pointer, - copy: snd_rme96_playback_copy, - silence: snd_rme96_playback_silence, + .open = snd_rme96_playback_spdif_open, + .close = snd_rme96_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme96_playback_hw_params, + .hw_free = snd_rme96_playback_hw_free, + .prepare = snd_rme96_playback_prepare, + .trigger = snd_rme96_playback_trigger, + .pointer = snd_rme96_playback_pointer, + .copy = snd_rme96_playback_copy, + .silence = snd_rme96_playback_silence, }; static snd_pcm_ops_t snd_rme96_capture_spdif_ops = { - open: snd_rme96_capture_spdif_open, - close: snd_rme96_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme96_capture_hw_params, - hw_free: snd_rme96_capture_hw_free, - prepare: snd_rme96_capture_prepare, - trigger: snd_rme96_capture_trigger, - pointer: snd_rme96_capture_pointer, - copy: snd_rme96_capture_copy, + .open = snd_rme96_capture_spdif_open, + .close = snd_rme96_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme96_capture_hw_params, + .hw_free = snd_rme96_capture_hw_free, + .prepare = snd_rme96_capture_prepare, + .trigger = snd_rme96_capture_trigger, + .pointer = snd_rme96_capture_pointer, + .copy = snd_rme96_capture_copy, }; static snd_pcm_ops_t snd_rme96_playback_adat_ops = { - open: snd_rme96_playback_adat_open, - close: snd_rme96_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme96_playback_hw_params, - hw_free: snd_rme96_playback_hw_free, - prepare: snd_rme96_playback_prepare, - trigger: snd_rme96_playback_trigger, - pointer: snd_rme96_playback_pointer, - copy: snd_rme96_playback_copy, - silence: snd_rme96_playback_silence, + .open = snd_rme96_playback_adat_open, + .close = snd_rme96_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme96_playback_hw_params, + .hw_free = snd_rme96_playback_hw_free, + .prepare = snd_rme96_playback_prepare, + .trigger = snd_rme96_playback_trigger, + .pointer = snd_rme96_playback_pointer, + .copy = snd_rme96_playback_copy, + .silence = snd_rme96_playback_silence, }; static snd_pcm_ops_t snd_rme96_capture_adat_ops = { - open: snd_rme96_capture_adat_open, - close: snd_rme96_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_rme96_capture_hw_params, - hw_free: snd_rme96_capture_hw_free, - prepare: snd_rme96_capture_prepare, - trigger: snd_rme96_capture_trigger, - pointer: snd_rme96_capture_pointer, - copy: snd_rme96_capture_copy, + .open = snd_rme96_capture_adat_open, + .close = snd_rme96_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_rme96_capture_hw_params, + .hw_free = snd_rme96_capture_hw_free, + .prepare = snd_rme96_capture_prepare, + .trigger = snd_rme96_capture_trigger, + .pointer = snd_rme96_capture_pointer, + .copy = snd_rme96_capture_copy, }; static void @@ -2299,81 +2299,81 @@ static snd_kcontrol_new_t snd_rme96_controls[] = { { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - info: snd_rme96_control_spdif_info, - get: snd_rme96_control_spdif_get, - put: snd_rme96_control_spdif_put + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), + .info = snd_rme96_control_spdif_info, + .get = snd_rme96_control_spdif_get, + .put = snd_rme96_control_spdif_put }, { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), - info: snd_rme96_control_spdif_stream_info, - get: snd_rme96_control_spdif_stream_get, - put: snd_rme96_control_spdif_stream_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), + .info = snd_rme96_control_spdif_stream_info, + .get = snd_rme96_control_spdif_stream_get, + .put = snd_rme96_control_spdif_stream_put }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), - info: snd_rme96_control_spdif_mask_info, - get: snd_rme96_control_spdif_mask_get, - private_value: IEC958_AES0_NONAUDIO | + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), + .info = snd_rme96_control_spdif_mask_info, + .get = snd_rme96_control_spdif_mask_get, + .private_value = IEC958_AES0_NONAUDIO | IEC958_AES0_PROFESSIONAL | IEC958_AES0_CON_EMPHASIS }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), - info: snd_rme96_control_spdif_mask_info, - get: snd_rme96_control_spdif_mask_get, - private_value: IEC958_AES0_NONAUDIO | + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), + .info = snd_rme96_control_spdif_mask_info, + .get = snd_rme96_control_spdif_mask_get, + .private_value = IEC958_AES0_NONAUDIO | IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Input Connector", - info: snd_rme96_info_inputtype_control, - get: snd_rme96_get_inputtype_control, - put: snd_rme96_put_inputtype_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Input Connector", + .info = snd_rme96_info_inputtype_control, + .get = snd_rme96_get_inputtype_control, + .put = snd_rme96_put_inputtype_control }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Loopback Input", - info: snd_rme96_info_loopback_control, - get: snd_rme96_get_loopback_control, - put: snd_rme96_put_loopback_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Loopback Input", + .info = snd_rme96_info_loopback_control, + .get = snd_rme96_get_loopback_control, + .put = snd_rme96_put_loopback_control }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Clock Mode", - info: snd_rme96_info_clockmode_control, - get: snd_rme96_get_clockmode_control, - put: snd_rme96_put_clockmode_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Clock Mode", + .info = snd_rme96_info_clockmode_control, + .get = snd_rme96_get_clockmode_control, + .put = snd_rme96_put_clockmode_control }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Monitor Tracks", - info: snd_rme96_info_montracks_control, - get: snd_rme96_get_montracks_control, - put: snd_rme96_put_montracks_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Monitor Tracks", + .info = snd_rme96_info_montracks_control, + .get = snd_rme96_get_montracks_control, + .put = snd_rme96_put_montracks_control }, { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Attenuation", - info: snd_rme96_info_attenuation_control, - get: snd_rme96_get_attenuation_control, - put: snd_rme96_put_attenuation_control + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Attenuation", + .info = snd_rme96_info_attenuation_control, + .get = snd_rme96_get_attenuation_control, + .put = snd_rme96_put_attenuation_control }, { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "DAC Playback Volume", - info: snd_rme96_dac_volume_info, - get: snd_rme96_dac_volume_get, - put: snd_rme96_dac_volume_put + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "DAC Playback Volume", + .info = snd_rme96_dac_volume_info, + .get = snd_rme96_dac_volume_get, + .put = snd_rme96_dac_volume_put } }; @@ -2477,10 +2477,10 @@ } static struct pci_driver driver = { - name: "RME Digi96", - id_table: snd_rme96_ids, - probe: snd_rme96_probe, - remove: __devexit_p(snd_rme96_remove), + .name = "RME Digi96", + .id_table = snd_rme96_ids, + .probe = snd_rme96_probe, + .remove = __devexit_p(snd_rme96_remove), }; static int __init alsa_card_rme96_init(void) diff -Nru a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c --- a/sound/pci/rme9652/hdsp.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/rme9652/hdsp.c Tue Oct 1 17:07:16 2002 @@ -1022,16 +1022,16 @@ snd_rawmidi_ops_t snd_hdsp_midi_output = { - open: snd_hdsp_midi_output_open, - close: snd_hdsp_midi_output_close, - trigger: snd_hdsp_midi_output_trigger, + .open = snd_hdsp_midi_output_open, + .close = snd_hdsp_midi_output_close, + .trigger = snd_hdsp_midi_output_trigger, }; snd_rawmidi_ops_t snd_hdsp_midi_input = { - open: snd_hdsp_midi_input_open, - close: snd_hdsp_midi_input_close, - trigger: snd_hdsp_midi_input_trigger, + .open = snd_hdsp_midi_input_open, + .close = snd_hdsp_midi_input_close, + .trigger = snd_hdsp_midi_input_trigger, }; static int __devinit snd_hdsp_create_midi (snd_card_t *card, hdsp_t *hdsp, int id) @@ -1166,9 +1166,9 @@ } #define HDSP_SPDIF_IN(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_hdsp_info_spdif_in, \ - get: snd_hdsp_get_spdif_in, put: snd_hdsp_put_spdif_in } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_hdsp_info_spdif_in, \ + .get = snd_hdsp_get_spdif_in, .put = snd_hdsp_put_spdif_in } static unsigned int hdsp_spdif_in(hdsp_t *hdsp) { @@ -1226,9 +1226,9 @@ } #define HDSP_SPDIF_OUT(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_hdsp_info_spdif_out, \ - get: snd_hdsp_get_spdif_out, put: snd_hdsp_put_spdif_out } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_hdsp_info_spdif_out, \ + .get = snd_hdsp_get_spdif_out, .put = snd_hdsp_put_spdif_out } static int hdsp_spdif_out(hdsp_t *hdsp) { @@ -1284,9 +1284,9 @@ } #define HDSP_SYNC_PREF(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_hdsp_info_sync_pref, \ - get: snd_hdsp_get_sync_pref, put: snd_hdsp_put_sync_pref } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_hdsp_info_sync_pref, \ + .get = snd_hdsp_get_sync_pref, .put = snd_hdsp_put_sync_pref } static int hdsp_sync_pref(hdsp_t *hdsp) { @@ -1399,10 +1399,10 @@ } #define HDSP_PASSTHRU(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_hdsp_info_passthru, \ - put: snd_hdsp_put_passthru, \ - get: snd_hdsp_get_passthru } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_hdsp_info_passthru, \ + .put = snd_hdsp_put_passthru, \ + .get = snd_hdsp_get_passthru } static int snd_hdsp_info_passthru(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1445,9 +1445,9 @@ } #define HDSP_LINE_OUT(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_hdsp_info_line_out, \ - get: snd_hdsp_get_line_out, put: snd_hdsp_put_line_out } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_hdsp_info_line_out, \ + .get = snd_hdsp_get_line_out, .put = snd_hdsp_put_line_out } static int hdsp_line_out(hdsp_t *hdsp) { @@ -1503,9 +1503,9 @@ } #define HDSP_MIXER(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_hdsp_info_mixer, \ - get: snd_hdsp_get_mixer, put: snd_hdsp_put_mixer } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_hdsp_info_mixer, \ + .get = snd_hdsp_get_mixer, .put = snd_hdsp_put_mixer } static int snd_hdsp_info_mixer(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1577,11 +1577,11 @@ */ #define HDSP_PLAYBACK_MIXER \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE | \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_WRITE | \ SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_hdsp_info_playback_mixer, \ - get: snd_hdsp_get_playback_mixer, put: snd_hdsp_put_playback_mixer } + .info = snd_hdsp_info_playback_mixer, \ + .get = snd_hdsp_get_playback_mixer, .put = snd_hdsp_put_playback_mixer } static int snd_hdsp_info_playback_mixer(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1634,10 +1634,10 @@ } #define HDSP_PEAK_PLAYBACK \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_hdsp_info_peak_playback, \ - get: snd_hdsp_get_peak_playback \ +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_hdsp_info_peak_playback, \ + .get = snd_hdsp_get_peak_playback \ } static int snd_hdsp_info_peak_playback(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -1657,10 +1657,10 @@ } #define HDSP_PEAK_INPUT \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_hdsp_info_peak_input, \ - get: snd_hdsp_get_peak_input \ +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_hdsp_info_peak_input, \ + .get = snd_hdsp_get_peak_input \ } static int snd_hdsp_info_peak_input(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -1680,10 +1680,10 @@ } #define HDSP_PEAK_OUTPUT \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_hdsp_info_peak_output, \ - get: snd_hdsp_get_peak_output \ +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_hdsp_info_peak_output, \ + .get = snd_hdsp_get_peak_output \ } static int snd_hdsp_info_peak_output(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -1703,10 +1703,10 @@ } #define HDSP_RMS_INPUT \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_hdsp_info_rms_input, \ - get: snd_hdsp_get_rms_input \ +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_hdsp_info_rms_input, \ + .get = snd_hdsp_get_rms_input \ } static int snd_hdsp_info_rms_input(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -1724,10 +1724,10 @@ } #define HDSP_RMS_PLAYBACK \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_hdsp_info_rms_playback, \ - get: snd_hdsp_get_rms_playback \ +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_hdsp_info_rms_playback, \ + .get = snd_hdsp_get_rms_playback \ } static int snd_hdsp_info_rms_playback(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -1746,37 +1746,37 @@ static snd_kcontrol_new_t snd_hdsp_controls[] = { { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - info: snd_hdsp_control_spdif_info, - get: snd_hdsp_control_spdif_get, - put: snd_hdsp_control_spdif_put, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), + .info = snd_hdsp_control_spdif_info, + .get = snd_hdsp_control_spdif_get, + .put = snd_hdsp_control_spdif_put, }, { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), - info: snd_hdsp_control_spdif_stream_info, - get: snd_hdsp_control_spdif_stream_get, - put: snd_hdsp_control_spdif_stream_put, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), + .info = snd_hdsp_control_spdif_stream_info, + .get = snd_hdsp_control_spdif_stream_get, + .put = snd_hdsp_control_spdif_stream_put, }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), - info: snd_hdsp_control_spdif_mask_info, - get: snd_hdsp_control_spdif_mask_get, - private_value: IEC958_AES0_NONAUDIO | + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), + .info = snd_hdsp_control_spdif_mask_info, + .get = snd_hdsp_control_spdif_mask_get, + .private_value = IEC958_AES0_NONAUDIO | IEC958_AES0_PROFESSIONAL | IEC958_AES0_CON_EMPHASIS, }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), - info: snd_hdsp_control_spdif_mask_info, - get: snd_hdsp_control_spdif_mask_get, - private_value: IEC958_AES0_NONAUDIO | + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), + .info = snd_hdsp_control_spdif_mask_info, + .get = snd_hdsp_control_spdif_mask_get, + .private_value = IEC958_AES0_NONAUDIO | IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS, }, @@ -2546,53 +2546,53 @@ static snd_pcm_hardware_t snd_hdsp_playback_subinfo = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_NONINTERLEAVED | SNDRV_PCM_INFO_SYNC_START | SNDRV_PCM_INFO_DOUBLE), - formats: SNDRV_PCM_FMTBIT_S32_LE, - rates: (SNDRV_PCM_RATE_32000 | + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000), - rate_min: 32000, - rate_max: 96000, - channels_min: 10, - channels_max: HDSP_MAX_CHANNELS, - buffer_bytes_max: 1024*1024, - period_bytes_min: 1, - period_bytes_max: 1024*1024, - periods_min: 2, - periods_max: 2, - fifo_size: 0, + .rate_min = 32000, + .rate_max = 96000, + .channels_min = 10, + .channels_max = HDSP_MAX_CHANNELS, + .buffer_bytes_max = 1024*1024, + .period_bytes_min = 1, + .period_bytes_max = 1024*1024, + .periods_min = 2, + .periods_max = 2, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_hdsp_capture_subinfo = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_NONINTERLEAVED | SNDRV_PCM_INFO_SYNC_START), - formats: SNDRV_PCM_FMTBIT_S32_LE, - rates: (SNDRV_PCM_RATE_32000 | + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000), - rate_min: 32000, - rate_max: 96000, - channels_min: 10, - channels_max: HDSP_MAX_CHANNELS, - buffer_bytes_max: 1024*1024, - period_bytes_min: 1, - period_bytes_max: 1024*1024, - periods_min: 2, - periods_max: 2, - fifo_size: 0, + .rate_min = 32000, + .rate_max = 96000, + .channels_min = 10, + .channels_max = HDSP_MAX_CHANNELS, + .buffer_bytes_max = 1024*1024, + .period_bytes_min = 1, + .period_bytes_max = 1024*1024, + .periods_min = 2, + .periods_max = 2, + .fifo_size = 0, }; static unsigned int period_sizes[] = { 64, 128, 256, 512, 1024, 2048, 4096, 8192 }; @@ -2600,9 +2600,9 @@ #define PERIOD_SIZES sizeof(period_sizes) / sizeof(period_sizes[0]) static snd_pcm_hw_constraint_list_t hw_constraints_period_sizes = { - count: PERIOD_SIZES, - list: period_sizes, - mask: 0 + .count = PERIOD_SIZES, + .list = period_sizes, + .mask = 0 }; static int snd_hdsp_hw_rule_channels(snd_pcm_hw_params_t *params, @@ -2785,26 +2785,26 @@ } static snd_pcm_ops_t snd_hdsp_playback_ops = { - open: snd_hdsp_playback_open, - close: snd_hdsp_playback_release, - ioctl: snd_hdsp_ioctl, - hw_params: snd_hdsp_hw_params, - prepare: snd_hdsp_prepare, - trigger: snd_hdsp_trigger, - pointer: snd_hdsp_hw_pointer, - copy: snd_hdsp_playback_copy, - silence: snd_hdsp_hw_silence, + .open = snd_hdsp_playback_open, + .close = snd_hdsp_playback_release, + .ioctl = snd_hdsp_ioctl, + .hw_params = snd_hdsp_hw_params, + .prepare = snd_hdsp_prepare, + .trigger = snd_hdsp_trigger, + .pointer = snd_hdsp_hw_pointer, + .copy = snd_hdsp_playback_copy, + .silence = snd_hdsp_hw_silence, }; static snd_pcm_ops_t snd_hdsp_capture_ops = { - open: snd_hdsp_capture_open, - close: snd_hdsp_capture_release, - ioctl: snd_hdsp_ioctl, - hw_params: snd_hdsp_hw_params, - prepare: snd_hdsp_prepare, - trigger: snd_hdsp_trigger, - pointer: snd_hdsp_hw_pointer, - copy: snd_hdsp_capture_copy, + .open = snd_hdsp_capture_open, + .close = snd_hdsp_capture_release, + .ioctl = snd_hdsp_ioctl, + .hw_params = snd_hdsp_hw_params, + .prepare = snd_hdsp_prepare, + .trigger = snd_hdsp_trigger, + .pointer = snd_hdsp_hw_pointer, + .copy = snd_hdsp_capture_copy, }; static int __devinit snd_hdsp_create_pcm(snd_card_t *card, @@ -3115,10 +3115,10 @@ } static struct pci_driver driver = { - name:"RME Hammerfall DSP", - id_table:snd_hdsp_ids, - probe:snd_hdsp_probe, - remove:__devexit_p(snd_hdsp_remove), + .name = "RME Hammerfall DSP", + .id_table = snd_hdsp_ids, + .probe = snd_hdsp_probe, + .remove = __devexit_p(snd_hdsp_remove), }; static int __init alsa_card_hdsp_init(void) diff -Nru a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c --- a/sound/pci/rme9652/rme9652.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/rme9652/rme9652.c Tue Oct 1 17:07:16 2002 @@ -878,10 +878,10 @@ } #define RME9652_ADAT1_IN(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_rme9652_info_adat1_in, \ - get: snd_rme9652_get_adat1_in, \ - put: snd_rme9652_put_adat1_in } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_rme9652_info_adat1_in, \ + .get = snd_rme9652_get_adat1_in, \ + .put = snd_rme9652_put_adat1_in } static unsigned int rme9652_adat1_in(rme9652_t *rme9652) { @@ -958,9 +958,9 @@ } #define RME9652_SPDIF_IN(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_rme9652_info_spdif_in, \ - get: snd_rme9652_get_spdif_in, put: snd_rme9652_put_spdif_in } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_rme9652_info_spdif_in, \ + .get = snd_rme9652_get_spdif_in, .put = snd_rme9652_put_spdif_in } static unsigned int rme9652_spdif_in(rme9652_t *rme9652) { @@ -1031,9 +1031,9 @@ } #define RME9652_SPDIF_OUT(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_rme9652_info_spdif_out, \ - get: snd_rme9652_get_spdif_out, put: snd_rme9652_put_spdif_out } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_rme9652_info_spdif_out, \ + .get = snd_rme9652_get_spdif_out, .put = snd_rme9652_put_spdif_out } static int rme9652_spdif_out(rme9652_t *rme9652) { @@ -1101,9 +1101,9 @@ } #define RME9652_SYNC_MODE(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_rme9652_info_sync_mode, \ - get: snd_rme9652_get_sync_mode, put: snd_rme9652_put_sync_mode } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_rme9652_info_sync_mode, \ + .get = snd_rme9652_get_sync_mode, .put = snd_rme9652_put_sync_mode } static int rme9652_sync_mode(rme9652_t *rme9652) { @@ -1188,9 +1188,9 @@ } #define RME9652_SYNC_PREF(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_rme9652_info_sync_pref, \ - get: snd_rme9652_get_sync_pref, put: snd_rme9652_put_sync_pref } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_rme9652_info_sync_pref, \ + .get = snd_rme9652_get_sync_pref, .put = snd_rme9652_put_sync_pref } static int rme9652_sync_pref(rme9652_t *rme9652) { @@ -1336,10 +1336,10 @@ } #define RME9652_PASSTHRU(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - info: snd_rme9652_info_passthru, \ - put: snd_rme9652_put_passthru, \ - get: snd_rme9652_get_passthru } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .info = snd_rme9652_info_passthru, \ + .put = snd_rme9652_put_passthru, \ + .get = snd_rme9652_get_passthru } static int snd_rme9652_info_passthru(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1384,10 +1384,10 @@ /* Read-only switches */ #define RME9652_SPDIF_RATE(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_rme9652_info_spdif_rate, \ - get: snd_rme9652_get_spdif_rate } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_rme9652_info_spdif_rate, \ + .get = snd_rme9652_get_spdif_rate } static int snd_rme9652_info_spdif_rate(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1410,10 +1410,10 @@ } #define RME9652_ADAT_SYNC(xname, xindex, xidx) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_rme9652_info_adat_sync, \ - get: snd_rme9652_get_adat_sync, private_value: xidx } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_rme9652_info_adat_sync, \ + .get = snd_rme9652_get_adat_sync, .private_value = xidx } static int snd_rme9652_info_adat_sync(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1446,10 +1446,10 @@ } #define RME9652_TC_VALID(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_PCM, name: xname, index: xindex, \ - access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ - info: snd_rme9652_info_tc_valid, \ - get: snd_rme9652_get_tc_valid } +{ .iface = SNDRV_CTL_ELEM_IFACE_PCM, .name = xname, .index = xindex, \ + .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \ + .info = snd_rme9652_info_tc_valid, \ + .get = snd_rme9652_get_tc_valid } static int snd_rme9652_info_tc_valid(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1530,37 +1530,37 @@ static snd_kcontrol_new_t snd_rme9652_controls[] = { { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - info: snd_rme9652_control_spdif_info, - get: snd_rme9652_control_spdif_get, - put: snd_rme9652_control_spdif_put, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), + .info = snd_rme9652_control_spdif_info, + .get = snd_rme9652_control_spdif_get, + .put = snd_rme9652_control_spdif_put, }, { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), - info: snd_rme9652_control_spdif_stream_info, - get: snd_rme9652_control_spdif_stream_get, - put: snd_rme9652_control_spdif_stream_put, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), + .info = snd_rme9652_control_spdif_stream_info, + .get = snd_rme9652_control_spdif_stream_get, + .put = snd_rme9652_control_spdif_stream_put, }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), - info: snd_rme9652_control_spdif_mask_info, - get: snd_rme9652_control_spdif_mask_get, - private_value: IEC958_AES0_NONAUDIO | + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), + .info = snd_rme9652_control_spdif_mask_info, + .get = snd_rme9652_control_spdif_mask_get, + .private_value = IEC958_AES0_NONAUDIO | IEC958_AES0_PROFESSIONAL | IEC958_AES0_CON_EMPHASIS, }, { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), - info: snd_rme9652_control_spdif_mask_info, - get: snd_rme9652_control_spdif_mask_get, - private_value: IEC958_AES0_NONAUDIO | + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK), + .info = snd_rme9652_control_spdif_mask_info, + .get = snd_rme9652_control_spdif_mask_get, + .private_value = IEC958_AES0_NONAUDIO | IEC958_AES0_PROFESSIONAL | IEC958_AES0_PRO_EMPHASIS, }, @@ -1569,12 +1569,12 @@ RME9652_SYNC_MODE("Sync Mode", 0), RME9652_SYNC_PREF("Preferred Sync Source", 0), { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: "Channels Thru", - index: 0, - info: snd_rme9652_info_thru, - get: snd_rme9652_get_thru, - put: snd_rme9652_put_thru, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = "Channels Thru", + .index = 0, + .info = snd_rme9652_info_thru, + .get = snd_rme9652_get_thru, + .put = snd_rme9652_put_thru, }, RME9652_SPDIF_RATE("IEC958 Sample Rate", 0), RME9652_ADAT_SYNC("ADAT1 Sync Check", 0, 0), @@ -2265,49 +2265,49 @@ static snd_pcm_hardware_t snd_rme9652_playback_subinfo = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_NONINTERLEAVED | SNDRV_PCM_INFO_SYNC_START | SNDRV_PCM_INFO_DOUBLE), - formats: SNDRV_PCM_FMTBIT_S32_LE, - rates: (SNDRV_PCM_RATE_44100 | + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000), - rate_min: 44100, - rate_max: 96000, - channels_min: 10, - channels_max: 26, - buffer_bytes_max: 1024*1024, - period_bytes_min: 1, - period_bytes_max: 1024*1024, - periods_min: 2, - periods_max: 2, - fifo_size: 0, + .rate_min = 44100, + .rate_max = 96000, + .channels_min = 10, + .channels_max = 26, + .buffer_bytes_max = 1024*1024, + .period_bytes_min = 1, + .period_bytes_max = 1024*1024, + .periods_min = 2, + .periods_max = 2, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_rme9652_capture_subinfo = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_NONINTERLEAVED | SNDRV_PCM_INFO_SYNC_START), - formats: SNDRV_PCM_FMTBIT_S32_LE, - rates: (SNDRV_PCM_RATE_44100 | + .formats = SNDRV_PCM_FMTBIT_S32_LE, + .rates = (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000), - rate_min: 44100, - rate_max: 96000, - channels_min: 10, - channels_max: 26, - buffer_bytes_max: 1024*1024, - period_bytes_min: 1, - period_bytes_max: 1024*1024, - periods_min: 2, - periods_max: 2, - fifo_size: 0, + .rate_min = 44100, + .rate_max = 96000, + .channels_min = 10, + .channels_max = 26, + .buffer_bytes_max = 1024*1024, + .period_bytes_min = 1, + .period_bytes_max = 1024*1024, + .periods_min = 2, + .periods_max = 2, + .fifo_size = 0, }; static unsigned int period_sizes[] = { 64, 128, 256, 512, 1024, 2048, 4096, 8192 }; @@ -2315,9 +2315,9 @@ #define PERIOD_SIZES sizeof(period_sizes) / sizeof(period_sizes[0]) static snd_pcm_hw_constraint_list_t hw_constraints_period_sizes = { - count: PERIOD_SIZES, - list: period_sizes, - mask: 0 + .count = PERIOD_SIZES, + .list = period_sizes, + .mask = 0 }; static int snd_rme9652_hw_rule_channels(snd_pcm_hw_params_t *params, @@ -2492,26 +2492,26 @@ } static snd_pcm_ops_t snd_rme9652_playback_ops = { - open: snd_rme9652_playback_open, - close: snd_rme9652_playback_release, - ioctl: snd_rme9652_ioctl, - hw_params: snd_rme9652_hw_params, - prepare: snd_rme9652_prepare, - trigger: snd_rme9652_trigger, - pointer: snd_rme9652_hw_pointer, - copy: snd_rme9652_playback_copy, - silence: snd_rme9652_hw_silence, + .open = snd_rme9652_playback_open, + .close = snd_rme9652_playback_release, + .ioctl = snd_rme9652_ioctl, + .hw_params = snd_rme9652_hw_params, + .prepare = snd_rme9652_prepare, + .trigger = snd_rme9652_trigger, + .pointer = snd_rme9652_hw_pointer, + .copy = snd_rme9652_playback_copy, + .silence = snd_rme9652_hw_silence, }; static snd_pcm_ops_t snd_rme9652_capture_ops = { - open: snd_rme9652_capture_open, - close: snd_rme9652_capture_release, - ioctl: snd_rme9652_ioctl, - hw_params: snd_rme9652_hw_params, - prepare: snd_rme9652_prepare, - trigger: snd_rme9652_trigger, - pointer: snd_rme9652_hw_pointer, - copy: snd_rme9652_capture_copy, + .open = snd_rme9652_capture_open, + .close = snd_rme9652_capture_release, + .ioctl = snd_rme9652_ioctl, + .hw_params = snd_rme9652_hw_params, + .prepare = snd_rme9652_prepare, + .trigger = snd_rme9652_trigger, + .pointer = snd_rme9652_hw_pointer, + .copy = snd_rme9652_capture_copy, }; static int __init snd_rme9652_create_pcm(snd_card_t *card, @@ -2733,10 +2733,10 @@ } static struct pci_driver driver = { - name:"RME Digi9652 (Hammerfall)", - id_table:snd_rme9652_ids, - probe:snd_rme9652_probe, - remove:__devexit_p(snd_rme9652_remove), + .name ="RME Digi9652 (Hammerfall)", + .id_table = snd_rme9652_ids, + .probe = snd_rme9652_probe, + .remove = __devexit_p(snd_rme9652_remove), }; static int __init alsa_card_hammerfall_init(void) diff -Nru a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c --- a/sound/pci/sonicvibes.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/sonicvibes.c Tue Oct 1 17:07:16 2002 @@ -759,40 +759,40 @@ static snd_pcm_hardware_t snd_sonicvibes_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_U8 | 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: 32, - period_bytes_max: (128*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | 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 = 32, + .period_bytes_max = (128*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_sonicvibes_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_U8 | 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: 32, - period_bytes_max: (128*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | 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 = 32, + .period_bytes_max = (128*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; static int snd_sonicvibes_playback_open(snd_pcm_substream_t * substream) @@ -839,25 +839,25 @@ } static snd_pcm_ops_t snd_sonicvibes_playback_ops = { - open: snd_sonicvibes_playback_open, - close: snd_sonicvibes_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_sonicvibes_hw_params, - hw_free: snd_sonicvibes_hw_free, - prepare: snd_sonicvibes_playback_prepare, - trigger: snd_sonicvibes_playback_trigger, - pointer: snd_sonicvibes_playback_pointer, + .open = snd_sonicvibes_playback_open, + .close = snd_sonicvibes_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sonicvibes_hw_params, + .hw_free = snd_sonicvibes_hw_free, + .prepare = snd_sonicvibes_playback_prepare, + .trigger = snd_sonicvibes_playback_trigger, + .pointer = snd_sonicvibes_playback_pointer, }; static snd_pcm_ops_t snd_sonicvibes_capture_ops = { - open: snd_sonicvibes_capture_open, - close: snd_sonicvibes_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_sonicvibes_hw_params, - hw_free: snd_sonicvibes_hw_free, - prepare: snd_sonicvibes_capture_prepare, - trigger: snd_sonicvibes_capture_trigger, - pointer: snd_sonicvibes_capture_pointer, + .open = snd_sonicvibes_capture_open, + .close = snd_sonicvibes_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sonicvibes_hw_params, + .hw_free = snd_sonicvibes_hw_free, + .prepare = snd_sonicvibes_capture_prepare, + .trigger = snd_sonicvibes_capture_trigger, + .pointer = snd_sonicvibes_capture_pointer, }; static void snd_sonicvibes_pcm_free(snd_pcm_t *pcm) @@ -897,9 +897,9 @@ */ #define SONICVIBES_MUX(xname, xindex) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_sonicvibes_info_mux, \ - get: snd_sonicvibes_get_mux, put: snd_sonicvibes_put_mux } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_sonicvibes_info_mux, \ + .get = snd_sonicvibes_get_mux, .put = snd_sonicvibes_put_mux } static int snd_sonicvibes_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -953,10 +953,10 @@ } #define SONICVIBES_SINGLE(xname, xindex, reg, shift, mask, invert) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_sonicvibes_info_single, \ - get: snd_sonicvibes_get_single, put: snd_sonicvibes_put_single, \ - private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_sonicvibes_info_single, \ + .get = snd_sonicvibes_get_single, .put = snd_sonicvibes_put_single, \ + .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) } static int snd_sonicvibes_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1011,10 +1011,10 @@ } #define SONICVIBES_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_sonicvibes_info_double, \ - get: snd_sonicvibes_get_double, put: snd_sonicvibes_put_double, \ - private_value: left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_sonicvibes_info_double, \ + .get = snd_sonicvibes_get_double, .put = snd_sonicvibes_put_double, \ + .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } static int snd_sonicvibes_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1258,7 +1258,7 @@ unsigned int dmaa, dmac; int err; static snd_device_ops_t ops = { - dev_free: snd_sonicvibes_dev_free, + .dev_free = snd_sonicvibes_dev_free, }; *rsonic = NULL; @@ -1538,10 +1538,10 @@ } static struct pci_driver driver = { - name: "S3 SonicVibes", - id_table: snd_sonic_ids, - probe: snd_sonic_probe, - remove: __devexit_p(snd_sonic_remove), + .name = "S3 SonicVibes", + .id_table = snd_sonic_ids, + .probe = snd_sonic_probe, + .remove = __devexit_p(snd_sonic_remove), }; static int __init alsa_card_sonicvibes_init(void) diff -Nru a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c --- a/sound/pci/trident/trident.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/trident/trident.c Tue Oct 1 17:07:16 2002 @@ -210,13 +210,13 @@ #endif static struct pci_driver driver = { - name: "Trident4DWaveAudio", - id_table: snd_trident_ids, - probe: snd_trident_probe, - remove: __devexit_p(snd_trident_remove), + .name = "Trident4DWaveAudio", + .id_table = snd_trident_ids, + .probe = snd_trident_probe, + .remove = __devexit_p(snd_trident_remove), #ifdef CONFIG_PM - suspend: snd_card_trident_suspend, - resume: snd_card_trident_resume, + .suspend = snd_card_trident_suspend, + .resume = snd_card_trident_resume, #endif }; diff -Nru a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c --- a/sound/pci/trident/trident_main.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/trident/trident_main.c Tue Oct 1 17:07:16 2002 @@ -1694,23 +1694,23 @@ static snd_pcm_hardware_t snd_trident_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), - formats: (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_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: (256*1024), - period_bytes_min: 64, - period_bytes_max: (256*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .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 = (256*1024), + .period_bytes_min = 64, + .period_bytes_max = (256*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; /* @@ -1719,23 +1719,23 @@ static snd_pcm_hardware_t snd_trident_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), - formats: (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | + .formats = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_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: 64, - period_bytes_max: (128*1024), - periods_min: 1, - periods_max: 1024, - fifo_size: 0, + .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 = 64, + .period_bytes_max = (128*1024), + .periods_min = 1, + .periods_max = 1024, + .fifo_size = 0, }; /* @@ -1744,22 +1744,22 @@ static snd_pcm_hardware_t snd_trident_foldback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: SNDRV_PCM_RATE_48000, - rate_min: 48000, - rate_max: 48000, - channels_min: 2, - 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 = SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_48000, + .rate_min = 48000, + .rate_max = 48000, + .channels_min = 2, + .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, }; /* @@ -1768,23 +1768,23 @@ static snd_pcm_hardware_t snd_trident_spdif = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), - formats: SNDRV_PCM_FMTBIT_S16_LE, - rates: (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .rates = (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000), - rate_min: 32000, - rate_max: 48000, - channels_min: 2, - 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, + .rate_min = 32000, + .rate_max = 48000, + .channels_min = 2, + .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 void snd_trident_pcm_free_substream(snd_pcm_runtime_t *runtime) @@ -2025,58 +2025,58 @@ ---------------------------------------------------------------------------*/ static snd_pcm_ops_t snd_trident_playback_ops = { - open: snd_trident_playback_open, - close: snd_trident_playback_close, - ioctl: snd_trident_ioctl, - hw_params: snd_trident_playback_hw_params, - hw_free: snd_trident_playback_hw_free, - prepare: snd_trident_playback_prepare, - trigger: snd_trident_trigger, - pointer: snd_trident_playback_pointer, + .open = snd_trident_playback_open, + .close = snd_trident_playback_close, + .ioctl = snd_trident_ioctl, + .hw_params = snd_trident_playback_hw_params, + .hw_free = snd_trident_playback_hw_free, + .prepare = snd_trident_playback_prepare, + .trigger = snd_trident_trigger, + .pointer = snd_trident_playback_pointer, }; static snd_pcm_ops_t snd_trident_capture_ops = { - open: snd_trident_capture_open, - close: snd_trident_capture_close, - ioctl: snd_trident_ioctl, - hw_params: snd_trident_capture_hw_params, - hw_free: snd_trident_capture_hw_free, - prepare: snd_trident_capture_prepare, - trigger: snd_trident_trigger, - pointer: snd_trident_capture_pointer, + .open = snd_trident_capture_open, + .close = snd_trident_capture_close, + .ioctl = snd_trident_ioctl, + .hw_params = snd_trident_capture_hw_params, + .hw_free = snd_trident_capture_hw_free, + .prepare = snd_trident_capture_prepare, + .trigger = snd_trident_trigger, + .pointer = snd_trident_capture_pointer, }; static snd_pcm_ops_t snd_trident_si7018_capture_ops = { - open: snd_trident_capture_open, - close: snd_trident_capture_close, - ioctl: snd_trident_ioctl, - hw_params: snd_trident_si7018_capture_hw_params, - hw_free: snd_trident_si7018_capture_hw_free, - prepare: snd_trident_si7018_capture_prepare, - trigger: snd_trident_trigger, - pointer: snd_trident_playback_pointer, + .open = snd_trident_capture_open, + .close = snd_trident_capture_close, + .ioctl = snd_trident_ioctl, + .hw_params = snd_trident_si7018_capture_hw_params, + .hw_free = snd_trident_si7018_capture_hw_free, + .prepare = snd_trident_si7018_capture_prepare, + .trigger = snd_trident_trigger, + .pointer = snd_trident_playback_pointer, }; static snd_pcm_ops_t snd_trident_foldback_ops = { - open: snd_trident_foldback_open, - close: snd_trident_foldback_close, - ioctl: snd_trident_ioctl, - hw_params: snd_trident_foldback_hw_params, - hw_free: snd_trident_foldback_hw_free, - prepare: snd_trident_foldback_prepare, - trigger: snd_trident_trigger, - pointer: snd_trident_playback_pointer, + .open = snd_trident_foldback_open, + .close = snd_trident_foldback_close, + .ioctl = snd_trident_ioctl, + .hw_params = snd_trident_foldback_hw_params, + .hw_free = snd_trident_foldback_hw_free, + .prepare = snd_trident_foldback_prepare, + .trigger = snd_trident_trigger, + .pointer = snd_trident_playback_pointer, }; static snd_pcm_ops_t snd_trident_spdif_ops = { - open: snd_trident_spdif_open, - close: snd_trident_spdif_close, - ioctl: snd_trident_ioctl, - hw_params: snd_trident_spdif_hw_params, - hw_free: snd_trident_spdif_hw_free, - prepare: snd_trident_spdif_prepare, - trigger: snd_trident_trigger, - pointer: snd_trident_spdif_pointer, + .open = snd_trident_spdif_open, + .close = snd_trident_spdif_close, + .ioctl = snd_trident_ioctl, + .hw_params = snd_trident_spdif_hw_params, + .hw_free = snd_trident_spdif_hw_free, + .prepare = snd_trident_spdif_prepare, + .trigger = snd_trident_trigger, + .pointer = snd_trident_spdif_pointer, }; /*--------------------------------------------------------------------------- @@ -2293,12 +2293,12 @@ static snd_kcontrol_new_t snd_trident_spdif_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), - info: snd_trident_spdif_control_info, - get: snd_trident_spdif_control_get, - put: snd_trident_spdif_control_put, - private_value: 0x28, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), + .info = snd_trident_spdif_control_info, + .get = snd_trident_spdif_control_get, + .put = snd_trident_spdif_control_put, + .private_value = 0x28, }; /*--------------------------------------------------------------------------- @@ -2352,11 +2352,11 @@ static snd_kcontrol_new_t snd_trident_spdif_default __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - info: snd_trident_spdif_default_info, - get: snd_trident_spdif_default_get, - put: snd_trident_spdif_default_put + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), + .info = snd_trident_spdif_default_info, + .get = snd_trident_spdif_default_get, + .put = snd_trident_spdif_default_put }; /*--------------------------------------------------------------------------- @@ -2384,11 +2384,11 @@ static snd_kcontrol_new_t snd_trident_spdif_mask __devinitdata = { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), - info: snd_trident_spdif_mask_info, - get: snd_trident_spdif_mask_get, + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), + .info = snd_trident_spdif_mask_info, + .get = snd_trident_spdif_mask_get, }; /*--------------------------------------------------------------------------- @@ -2442,12 +2442,12 @@ static snd_kcontrol_new_t snd_trident_spdif_stream __devinitdata = { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), - info: snd_trident_spdif_stream_info, - get: snd_trident_spdif_stream_get, - put: snd_trident_spdif_stream_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), + .info = snd_trident_spdif_stream_info, + .get = snd_trident_spdif_stream_get, + .put = snd_trident_spdif_stream_put }; /*--------------------------------------------------------------------------- @@ -2501,12 +2501,12 @@ static snd_kcontrol_new_t snd_trident_ac97_rear_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Rear Path", - info: snd_trident_ac97_control_info, - get: snd_trident_ac97_control_get, - put: snd_trident_ac97_control_put, - private_value: 4, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Rear Path", + .info = snd_trident_ac97_control_info, + .get = snd_trident_ac97_control_get, + .put = snd_trident_ac97_control_put, + .private_value = 4, }; /*--------------------------------------------------------------------------- @@ -2557,22 +2557,22 @@ static snd_kcontrol_new_t snd_trident_vol_music_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Music Playback Volume", - info: snd_trident_vol_control_info, - get: snd_trident_vol_control_get, - put: snd_trident_vol_control_put, - private_value: 16, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Music Playback Volume", + .info = snd_trident_vol_control_info, + .get = snd_trident_vol_control_get, + .put = snd_trident_vol_control_put, + .private_value = 16, }; static snd_kcontrol_new_t snd_trident_vol_wave_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "Wave Playback Volume", - info: snd_trident_vol_control_info, - get: snd_trident_vol_control_get, - put: snd_trident_vol_control_put, - private_value: 0, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Wave Playback Volume", + .info = snd_trident_vol_control_info, + .get = snd_trident_vol_control_get, + .put = snd_trident_vol_control_put, + .private_value = 0, }; /*--------------------------------------------------------------------------- @@ -2633,12 +2633,12 @@ static snd_kcontrol_new_t snd_trident_pcm_vol_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "PCM Front Playback Volume", - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - info: snd_trident_pcm_vol_control_info, - get: snd_trident_pcm_vol_control_get, - put: snd_trident_pcm_vol_control_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "PCM Front Playback Volume", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .info = snd_trident_pcm_vol_control_info, + .get = snd_trident_pcm_vol_control_get, + .put = snd_trident_pcm_vol_control_put, }; /*--------------------------------------------------------------------------- @@ -2694,12 +2694,12 @@ static snd_kcontrol_new_t snd_trident_pcm_pan_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "PCM Pan Playback Control", - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - info: snd_trident_pcm_pan_control_info, - get: snd_trident_pcm_pan_control_get, - put: snd_trident_pcm_pan_control_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "PCM Pan Playback Control", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .info = snd_trident_pcm_pan_control_info, + .get = snd_trident_pcm_pan_control_get, + .put = snd_trident_pcm_pan_control_put, }; /*--------------------------------------------------------------------------- @@ -2747,12 +2747,12 @@ static snd_kcontrol_new_t snd_trident_pcm_rvol_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "PCM Reverb Playback Volume", - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - info: snd_trident_pcm_rvol_control_info, - get: snd_trident_pcm_rvol_control_get, - put: snd_trident_pcm_rvol_control_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "PCM Reverb Playback Volume", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .info = snd_trident_pcm_rvol_control_info, + .get = snd_trident_pcm_rvol_control_get, + .put = snd_trident_pcm_rvol_control_put, }; /*--------------------------------------------------------------------------- @@ -2800,12 +2800,12 @@ static snd_kcontrol_new_t snd_trident_pcm_cvol_control __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "PCM Chorus Playback Volume", - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - info: snd_trident_pcm_cvol_control_info, - get: snd_trident_pcm_cvol_control_get, - put: snd_trident_pcm_cvol_control_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "PCM Chorus Playback Volume", + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .info = snd_trident_pcm_cvol_control_info, + .get = snd_trident_pcm_cvol_control_get, + .put = snd_trident_pcm_cvol_control_put, }; static void snd_trident_notify_pcm_change1(snd_card_t * card, snd_kcontrol_t *kctl, int activate) @@ -3152,7 +3152,7 @@ snd_trident_voice_t *voice; snd_trident_pcm_mixer_t *tmix; static snd_device_ops_t ops = { - dev_free: snd_trident_dev_free, + .dev_free = snd_trident_dev_free, }; *rtrident = NULL; diff -Nru a/sound/pci/via686.c b/sound/pci/via686.c --- a/sound/pci/via686.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/via686.c Tue Oct 1 17:07:16 2002 @@ -591,41 +591,41 @@ static snd_pcm_hardware_t snd_via686a_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE), - formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - rates: 0, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: 128 * 1024, - period_bytes_min: 32, - period_bytes_max: 128 * 1024, - periods_min: 2, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = 0, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 128 * 1024, + .periods_min = 2, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_via686a_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - rates: 0, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: 128 * 1024, - period_bytes_min: 32, - period_bytes_max: 128 * 1024, - periods_min: 2, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = 0, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 128 * 1024, + .periods_min = 2, + .periods_max = 1024, + .fifo_size = 0, }; static int snd_via686a_playback_open(snd_pcm_substream_t * substream) @@ -701,31 +701,31 @@ } static snd_pcm_ops_t snd_via686a_playback_ops = { - open: snd_via686a_playback_open, - close: snd_via686a_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_via686a_hw_params, - hw_free: snd_via686a_hw_free, - prepare: snd_via686a_playback_prepare, - trigger: snd_via686a_playback_trigger, - pointer: snd_via686a_playback_pointer, - copy: snd_pcm_sgbuf_ops_copy_playback, - silence: snd_pcm_sgbuf_ops_silence, - page: snd_pcm_sgbuf_ops_page, + .open = snd_via686a_playback_open, + .close = snd_via686a_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_via686a_hw_params, + .hw_free = snd_via686a_hw_free, + .prepare = snd_via686a_playback_prepare, + .trigger = snd_via686a_playback_trigger, + .pointer = snd_via686a_playback_pointer, + .copy = snd_pcm_sgbuf_ops_copy_playback, + .silence = snd_pcm_sgbuf_ops_silence, + .page = snd_pcm_sgbuf_ops_page, }; static snd_pcm_ops_t snd_via686a_capture_ops = { - open: snd_via686a_capture_open, - close: snd_via686a_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_via686a_hw_params, - hw_free: snd_via686a_hw_free, - prepare: snd_via686a_capture_prepare, - trigger: snd_via686a_capture_trigger, - pointer: snd_via686a_capture_pointer, - copy: snd_pcm_sgbuf_ops_copy_capture, - silence: snd_pcm_sgbuf_ops_silence, - page: snd_pcm_sgbuf_ops_page, + .open = snd_via686a_capture_open, + .close = snd_via686a_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_via686a_hw_params, + .hw_free = snd_via686a_hw_free, + .prepare = snd_via686a_capture_prepare, + .trigger = snd_via686a_capture_trigger, + .pointer = snd_via686a_capture_pointer, + .copy = snd_pcm_sgbuf_ops_copy_capture, + .silence = snd_pcm_sgbuf_ops_silence, + .page = snd_pcm_sgbuf_ops_page, }; static void snd_via686a_pcm_free(snd_pcm_t *pcm) @@ -838,11 +838,11 @@ } static snd_kcontrol_new_t snd_via686a_joystick_control __devinitdata = { - name: "Joystick", - iface: SNDRV_CTL_ELEM_IFACE_CARD, - info: snd_via686a_joystick_info, - get: snd_via686a_joystick_get, - put: snd_via686a_joystick_put, + .name = "Joystick", + .iface = SNDRV_CTL_ELEM_IFACE_CARD, + .info = snd_via686a_joystick_info, + .get = snd_via686a_joystick_get, + .put = snd_via686a_joystick_put, }; /* @@ -1008,7 +1008,7 @@ via686a_t *chip; int err; static snd_device_ops_t ops = { - dev_free: snd_via686a_dev_free, + .dev_free = snd_via686a_dev_free, }; if ((err = pci_enable_device(pci)) < 0) @@ -1201,10 +1201,10 @@ } static struct pci_driver driver = { - name: "VIA 82C686A/B", - id_table: snd_via686a_ids, - probe: snd_via686a_probe, - remove: __devexit_p(snd_via686a_remove), + .name = "VIA 82C686A/B", + .id_table = snd_via686a_ids, + .probe = snd_via686a_probe, + .remove = __devexit_p(snd_via686a_remove), }; static int __init alsa_card_via686a_init(void) diff -Nru a/sound/pci/via8233.c b/sound/pci/via8233.c --- a/sound/pci/via8233.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/via8233.c Tue Oct 1 17:07:16 2002 @@ -577,41 +577,41 @@ static snd_pcm_hardware_t snd_via8233_playback = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE), - formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - rates: 0, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 6, - buffer_bytes_max: 128 * 1024, - period_bytes_min: 32, - period_bytes_max: 128 * 1024, - periods_min: 2, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = 0, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 6, + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 128 * 1024, + .periods_min = 2, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_via8233_capture = { - info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), - formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - rates: 0, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: 128 * 1024, - period_bytes_min: 32, - period_bytes_max: 128 * 1024, - periods_min: 2, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = 0, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 32, + .period_bytes_max = 128 * 1024, + .periods_min = 2, + .periods_max = 1024, + .fifo_size = 0, }; static unsigned int channels[] = { @@ -621,9 +621,9 @@ #define CHANNELS sizeof(channels) / sizeof(channels[0]) static snd_pcm_hw_constraint_list_t hw_constraints_channels = { - count: CHANNELS, - list: channels, - mask: 0, + .count = CHANNELS, + .list = channels, + .mask = 0, }; static int snd_via8233_playback_open(snd_pcm_substream_t * substream) @@ -698,31 +698,31 @@ } static snd_pcm_ops_t snd_via8233_playback_ops = { - open: snd_via8233_playback_open, - close: snd_via8233_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_via8233_hw_params, - hw_free: snd_via8233_hw_free, - prepare: snd_via8233_playback_prepare, - trigger: snd_via8233_playback_trigger, - pointer: snd_via8233_playback_pointer, - copy: snd_pcm_sgbuf_ops_copy_playback, - silence: snd_pcm_sgbuf_ops_silence, - page: snd_pcm_sgbuf_ops_page, + .open = snd_via8233_playback_open, + .close = snd_via8233_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_via8233_hw_params, + .hw_free = snd_via8233_hw_free, + .prepare = snd_via8233_playback_prepare, + .trigger = snd_via8233_playback_trigger, + .pointer = snd_via8233_playback_pointer, + .copy = snd_pcm_sgbuf_ops_copy_playback, + .silence = snd_pcm_sgbuf_ops_silence, + .page = snd_pcm_sgbuf_ops_page, }; static snd_pcm_ops_t snd_via8233_capture_ops = { - open: snd_via8233_capture_open, - close: snd_via8233_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_via8233_hw_params, - hw_free: snd_via8233_hw_free, - prepare: snd_via8233_capture_prepare, - trigger: snd_via8233_capture_trigger, - pointer: snd_via8233_capture_pointer, - copy: snd_pcm_sgbuf_ops_copy_capture, - silence: snd_pcm_sgbuf_ops_silence, - page: snd_pcm_sgbuf_ops_page, + .open = snd_via8233_capture_open, + .close = snd_via8233_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_via8233_hw_params, + .hw_free = snd_via8233_hw_free, + .prepare = snd_via8233_capture_prepare, + .trigger = snd_via8233_capture_trigger, + .pointer = snd_via8233_capture_pointer, + .copy = snd_pcm_sgbuf_ops_copy_capture, + .silence = snd_pcm_sgbuf_ops_silence, + .page = snd_pcm_sgbuf_ops_page, }; static void snd_via8233_pcm_free(snd_pcm_t *pcm) @@ -871,7 +871,7 @@ via8233_t *chip; int err; static snd_device_ops_t ops = { - dev_free: snd_via8233_dev_free, + .dev_free = snd_via8233_dev_free, }; if ((err = pci_enable_device(pci)) < 0) @@ -991,10 +991,10 @@ } static struct pci_driver driver = { - name: "VIA 8233", - id_table: snd_via8233_ids, - probe: snd_via8233_probe, - remove: __devexit_p(snd_via8233_remove), + .name = "VIA 8233", + .id_table = snd_via8233_ids, + .probe = snd_via8233_probe, + .remove = __devexit_p(snd_via8233_remove), }; static int __init alsa_card_via8233_init(void) diff -Nru a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c --- a/sound/pci/ymfpci/ymfpci.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/ymfpci/ymfpci.c Tue Oct 1 17:07:16 2002 @@ -279,13 +279,13 @@ } static struct pci_driver driver = { - name: "Yamaha DS-XG PCI", - id_table: snd_ymfpci_ids, - probe: snd_card_ymfpci_probe, - remove: __devexit_p(snd_card_ymfpci_remove), + .name = "Yamaha DS-XG PCI", + .id_table = snd_ymfpci_ids, + .probe = snd_card_ymfpci_probe, + .remove = __devexit_p(snd_card_ymfpci_remove), #ifdef CONFIG_PM - suspend: snd_card_ymfpci_suspend, - resume: snd_card_ymfpci_resume, + .suspend = snd_card_ymfpci_suspend, + .resume = snd_card_ymfpci_resume, #endif }; diff -Nru a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c --- a/sound/pci/ymfpci/ymfpci_main.c Tue Oct 1 17:07:16 2002 +++ b/sound/pci/ymfpci/ymfpci_main.c Tue Oct 1 17:07:16 2002 @@ -787,46 +787,46 @@ static snd_pcm_hardware_t snd_ymfpci_playback = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), - formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: 256 * 1024, /* FIXME: enough? */ - period_bytes_min: 64, - period_bytes_max: 256 * 1024, /* FIXME: enough? */ - periods_min: 3, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = 256 * 1024, /* FIXME: enough? */ + .period_bytes_min = 64, + .period_bytes_max = 256 * 1024, /* FIXME: enough? */ + .periods_min = 3, + .periods_max = 1024, + .fifo_size = 0, }; static snd_pcm_hardware_t snd_ymfpci_capture = { - info: (SNDRV_PCM_INFO_MMAP | + .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME), - formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, - rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, - rate_min: 8000, - rate_max: 48000, - channels_min: 1, - channels_max: 2, - buffer_bytes_max: 256 * 1024, /* FIXME: enough? */ - period_bytes_min: 64, - period_bytes_max: 256 * 1024, /* FIXME: enough? */ - periods_min: 3, - periods_max: 1024, - fifo_size: 0, + .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000, + .rate_min = 8000, + .rate_max = 48000, + .channels_min = 1, + .channels_max = 2, + .buffer_bytes_max = 256 * 1024, /* FIXME: enough? */ + .period_bytes_min = 64, + .period_bytes_max = 256 * 1024, /* FIXME: enough? */ + .periods_min = 3, + .periods_max = 1024, + .fifo_size = 0, }; static void snd_ymfpci_pcm_free_substream(snd_pcm_runtime_t *runtime) @@ -1052,25 +1052,25 @@ } static snd_pcm_ops_t snd_ymfpci_playback_ops = { - open: snd_ymfpci_playback_open, - close: snd_ymfpci_playback_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ymfpci_playback_hw_params, - hw_free: snd_ymfpci_playback_hw_free, - prepare: snd_ymfpci_playback_prepare, - trigger: snd_ymfpci_playback_trigger, - pointer: snd_ymfpci_playback_pointer, + .open = snd_ymfpci_playback_open, + .close = snd_ymfpci_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ymfpci_playback_hw_params, + .hw_free = snd_ymfpci_playback_hw_free, + .prepare = snd_ymfpci_playback_prepare, + .trigger = snd_ymfpci_playback_trigger, + .pointer = snd_ymfpci_playback_pointer, }; static snd_pcm_ops_t snd_ymfpci_capture_rec_ops = { - open: snd_ymfpci_capture_rec_open, - close: snd_ymfpci_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ymfpci_capture_hw_params, - hw_free: snd_ymfpci_capture_hw_free, - prepare: snd_ymfpci_capture_prepare, - trigger: snd_ymfpci_capture_trigger, - pointer: snd_ymfpci_capture_pointer, + .open = snd_ymfpci_capture_rec_open, + .close = snd_ymfpci_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ymfpci_capture_hw_params, + .hw_free = snd_ymfpci_capture_hw_free, + .prepare = snd_ymfpci_capture_prepare, + .trigger = snd_ymfpci_capture_trigger, + .pointer = snd_ymfpci_capture_pointer, }; static void snd_ymfpci_pcm_free(snd_pcm_t *pcm) @@ -1108,14 +1108,14 @@ } static snd_pcm_ops_t snd_ymfpci_capture_ac97_ops = { - open: snd_ymfpci_capture_ac97_open, - close: snd_ymfpci_capture_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ymfpci_capture_hw_params, - hw_free: snd_ymfpci_capture_hw_free, - prepare: snd_ymfpci_capture_prepare, - trigger: snd_ymfpci_capture_trigger, - pointer: snd_ymfpci_capture_pointer, + .open = snd_ymfpci_capture_ac97_open, + .close = snd_ymfpci_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ymfpci_capture_hw_params, + .hw_free = snd_ymfpci_capture_hw_free, + .prepare = snd_ymfpci_capture_prepare, + .trigger = snd_ymfpci_capture_trigger, + .pointer = snd_ymfpci_capture_pointer, }; static void snd_ymfpci_pcm2_free(snd_pcm_t *pcm) @@ -1152,14 +1152,14 @@ } static snd_pcm_ops_t snd_ymfpci_playback_spdif_ops = { - open: snd_ymfpci_playback_spdif_open, - close: snd_ymfpci_playback_spdif_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ymfpci_playback_hw_params, - hw_free: snd_ymfpci_playback_hw_free, - prepare: snd_ymfpci_playback_prepare, - trigger: snd_ymfpci_playback_trigger, - pointer: snd_ymfpci_playback_pointer, + .open = snd_ymfpci_playback_spdif_open, + .close = snd_ymfpci_playback_spdif_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ymfpci_playback_hw_params, + .hw_free = snd_ymfpci_playback_hw_free, + .prepare = snd_ymfpci_playback_prepare, + .trigger = snd_ymfpci_playback_trigger, + .pointer = snd_ymfpci_playback_pointer, }; static void snd_ymfpci_pcm_spdif_free(snd_pcm_t *pcm) @@ -1192,14 +1192,14 @@ } static snd_pcm_ops_t snd_ymfpci_playback_4ch_ops = { - open: snd_ymfpci_playback_4ch_open, - close: snd_ymfpci_playback_4ch_close, - ioctl: snd_pcm_lib_ioctl, - hw_params: snd_ymfpci_playback_hw_params, - hw_free: snd_ymfpci_playback_hw_free, - prepare: snd_ymfpci_playback_prepare, - trigger: snd_ymfpci_playback_trigger, - pointer: snd_ymfpci_playback_pointer, + .open = snd_ymfpci_playback_4ch_open, + .close = snd_ymfpci_playback_4ch_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_ymfpci_playback_hw_params, + .hw_free = snd_ymfpci_playback_hw_free, + .prepare = snd_ymfpci_playback_prepare, + .trigger = snd_ymfpci_playback_trigger, + .pointer = snd_ymfpci_playback_pointer, }; static void snd_ymfpci_pcm_4ch_free(snd_pcm_t *pcm) @@ -1272,11 +1272,11 @@ static snd_kcontrol_new_t snd_ymfpci_spdif_default __devinitdata = { - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), - info: snd_ymfpci_spdif_default_info, - get: snd_ymfpci_spdif_default_get, - put: snd_ymfpci_spdif_default_put + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), + .info = snd_ymfpci_spdif_default_info, + .get = snd_ymfpci_spdif_default_get, + .put = snd_ymfpci_spdif_default_put }; static int snd_ymfpci_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -1301,11 +1301,11 @@ static snd_kcontrol_new_t snd_ymfpci_spdif_mask __devinitdata = { - access: SNDRV_CTL_ELEM_ACCESS_READ, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), - info: snd_ymfpci_spdif_mask_info, - get: snd_ymfpci_spdif_mask_get, + .access = SNDRV_CTL_ELEM_ACCESS_READ, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK), + .info = snd_ymfpci_spdif_mask_info, + .get = snd_ymfpci_spdif_mask_get, }; static int snd_ymfpci_spdif_stream_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) @@ -1349,12 +1349,12 @@ static snd_kcontrol_new_t snd_ymfpci_spdif_stream __devinitdata = { - access: SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, - iface: SNDRV_CTL_ELEM_IFACE_PCM, - name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), - info: snd_ymfpci_spdif_stream_info, - get: snd_ymfpci_spdif_stream_get, - put: snd_ymfpci_spdif_stream_put + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE, + .iface = SNDRV_CTL_ELEM_IFACE_PCM, + .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PCM_STREAM), + .info = snd_ymfpci_spdif_stream_info, + .get = snd_ymfpci_spdif_stream_get, + .put = snd_ymfpci_spdif_stream_put }; /* @@ -1362,10 +1362,10 @@ */ #define YMFPCI_SINGLE(xname, xindex, reg) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_ymfpci_info_single, \ - get: snd_ymfpci_get_single, put: snd_ymfpci_put_single, \ - private_value: reg } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_ymfpci_info_single, \ + .get = snd_ymfpci_get_single, .put = snd_ymfpci_put_single, \ + .private_value = reg } static int snd_ymfpci_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1428,10 +1428,10 @@ } #define YMFPCI_DOUBLE(xname, xindex, reg) \ -{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \ - info: snd_ymfpci_info_double, \ - get: snd_ymfpci_get_double, put: snd_ymfpci_put_double, \ - private_value: reg } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \ + .info = snd_ymfpci_info_double, \ + .get = snd_ymfpci_get_double, .put = snd_ymfpci_put_double, \ + .private_value = reg } static int snd_ymfpci_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) { @@ -1545,11 +1545,11 @@ YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH), 0, YDSXGR_SPDIFOUTCTRL), YMFPCI_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, YDSXGR_SPDIFINCTRL), { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "4ch Duplication", - info: snd_ymfpci_info_dup4ch, - get: snd_ymfpci_get_dup4ch, - put: snd_ymfpci_put_dup4ch, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "4ch Duplication", + .info = snd_ymfpci_info_dup4ch, + .get = snd_ymfpci_get_dup4ch, + .put = snd_ymfpci_put_dup4ch, }, }; @@ -1626,12 +1626,12 @@ } static snd_kcontrol_new_t snd_ymfpci_rear_shared __devinitdata = { - name: "Shared Rear/Line-In Switch", - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - info: snd_ymfpci_gpio_sw_info, - get: snd_ymfpci_gpio_sw_get, - put: snd_ymfpci_gpio_sw_put, - private_value: 2, + .name = "Shared Rear/Line-In Switch", + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .info = snd_ymfpci_gpio_sw_info, + .get = snd_ymfpci_gpio_sw_get, + .put = snd_ymfpci_gpio_sw_put, + .private_value = 2, }; @@ -1778,19 +1778,19 @@ } static snd_kcontrol_new_t snd_ymfpci_control_joystick __devinitdata = { - name: "Joystick", - iface: SNDRV_CTL_ELEM_IFACE_CARD, - info: snd_ymfpci_joystick_info, - get: snd_ymfpci_joystick_get, - put: snd_ymfpci_joystick_put, + .name = "Joystick", + .iface = SNDRV_CTL_ELEM_IFACE_CARD, + .info = snd_ymfpci_joystick_info, + .get = snd_ymfpci_joystick_get, + .put = snd_ymfpci_joystick_put, }; static snd_kcontrol_new_t snd_ymfpci_control_joystick_addr __devinitdata = { - name: "Joystick Address", - iface: SNDRV_CTL_ELEM_IFACE_CARD, - info: snd_ymfpci_joystick_addr_info, - get: snd_ymfpci_joystick_addr_get, - put: snd_ymfpci_joystick_addr_put, + .name = "Joystick Address", + .iface = SNDRV_CTL_ELEM_IFACE_CARD, + .info = snd_ymfpci_joystick_addr_info, + .get = snd_ymfpci_joystick_addr_get, + .put = snd_ymfpci_joystick_addr_put, }; int __devinit snd_ymfpci_joystick(ymfpci_t *chip) @@ -2199,7 +2199,7 @@ ymfpci_t *chip; int err; static snd_device_ops_t ops = { - dev_free: snd_ymfpci_dev_free, + .dev_free = snd_ymfpci_dev_free, }; *rchip = NULL; diff -Nru a/sound/ppc/awacs.c b/sound/ppc/awacs.c --- a/sound/ppc/awacs.c Tue Oct 1 17:07:16 2002 +++ b/sound/ppc/awacs.c Tue Oct 1 17:07:16 2002 @@ -164,11 +164,11 @@ #define AWACS_VOLUME(xname, xreg, xshift) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: 0, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0, \ .info = snd_pmac_awacs_info_volume, \ .get = snd_pmac_awacs_get_volume, \ .put = snd_pmac_awacs_put_volume, \ - private_value: (xreg) | ((xshift) << 8) } + .private_value = (xreg) | ((xshift) << 8) } /* * mute master/ogain for AWACS: mono @@ -213,11 +213,11 @@ } #define AWACS_SWITCH(xname, xreg, xshift, xinvert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: 0, \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0, \ .info = snd_pmac_boolean_mono_info, \ .get = snd_pmac_awacs_get_switch, \ .put = snd_pmac_awacs_put_switch, \ - private_value: (xreg) | ((xshift) << 8) | ((xinvert) << 16) } + .private_value = (xreg) | ((xshift) << 8) | ((xinvert) << 16) } #ifdef PMAC_AMP_AVAIL diff -Nru a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c --- a/sound/ppc/burgundy.c Tue Oct 1 17:07:16 2002 +++ b/sound/ppc/burgundy.c Tue Oct 1 17:07:16 2002 @@ -195,11 +195,10 @@ } #define BURGUNDY_VOLUME(xname, xindex, addr, shift) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\ - .info = snd_pmac_burgundy_info_volume,\ - .get = snd_pmac_burgundy_get_volume,\ - .put = snd_pmac_burgundy_put_volume,\ - private_value: ((ADDR2BASE(addr) & 0xff) | ((shift) << 8)) } +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\ + .info = snd_pmac_burgundy_info_volume,\ .get = snd_pmac_burgundy_get_volume,\ + .put = snd_pmac_burgundy_put_volume,\ .private_value = ((ADDR2BASE(addr) & + 0xff) | ((shift) << 8)) } /* lineout/speaker */ @@ -244,11 +243,11 @@ } #define BURGUNDY_OUTPUT_SWITCH(xname, xindex, lmask, rmask, stereo) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\ .info = snd_pmac_burgundy_info_switch_out,\ .get = snd_pmac_burgundy_get_switch_out,\ .put = snd_pmac_burgundy_put_switch_out,\ - private_value: ((lmask) | ((rmask) << 8) | ((stereo) << 24)) } + .private_value = ((lmask) | ((rmask) << 8) | ((stereo) << 24)) } /* line/speaker output volume */ static int snd_pmac_burgundy_info_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) @@ -294,11 +293,11 @@ } #define BURGUNDY_OUTPUT_VOLUME(xname, xindex, addr, stereo) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex,\ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex,\ .info = snd_pmac_burgundy_info_volume_out,\ .get = snd_pmac_burgundy_get_volume_out,\ .put = snd_pmac_burgundy_put_volume_out,\ - private_value: (ADDR2BASE(addr) | ((stereo) << 24)) } + .private_value = (ADDR2BASE(addr) | ((stereo) << 24)) } static snd_kcontrol_new_t snd_pmac_burgundy_mixers[] __initdata = { BURGUNDY_VOLUME("Master Playback Volume", 0, MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8), diff -Nru a/sound/ppc/daca.c b/sound/ppc/daca.c --- a/sound/ppc/daca.c Tue Oct 1 17:07:16 2002 +++ b/sound/ppc/daca.c Tue Oct 1 17:07:16 2002 @@ -200,19 +200,19 @@ .name = "Deemphasis Switch", .info = daca_info_deemphasis, .get = daca_get_deemphasis, - put: daca_put_deemphasis + .put = daca_put_deemphasis }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Master Playback Volume", .info = daca_info_volume, .get = daca_get_volume, - put: daca_put_volume + .put = daca_put_volume }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Power Amplifier Switch", .info = daca_info_amp, .get = daca_get_amp, - put: daca_put_amp + .put = daca_put_amp }, }; diff -Nru a/sound/ppc/pmac.c b/sound/ppc/pmac.c --- a/sound/ppc/pmac.c Tue Oct 1 17:07:16 2002 +++ b/sound/ppc/pmac.c Tue Oct 1 17:07:16 2002 @@ -437,40 +437,40 @@ static snd_pcm_hardware_t snd_pmac_playback = { - info: (SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_RESUME), - .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE, - .rates = SNDRV_PCM_RATE_8000_44100, - .rate_min = 7350, - .rate_max = 44100, - .channels_min = 2, - .channels_max = 2, - .buffer_bytes_max = 32768, - .period_bytes_min = 256, - .period_bytes_max = 16384, - .periods_min = 1, - .periods_max = PMAC_MAX_FRAGS, + .info = (SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_RESUME), + .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_8000_44100, + .rate_min = 7350, + .rate_max = 44100, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = 32768, + .period_bytes_min = 256, + .period_bytes_max = 16384, + .periods_min = 1, + .periods_max = PMAC_MAX_FRAGS, }; static snd_pcm_hardware_t snd_pmac_capture = { - info: (SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_RESUME), - .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE, - .rates = SNDRV_PCM_RATE_8000_44100, - .rate_min = 7350, - .rate_max = 44100, - .channels_min = 2, - .channels_max = 2, - .buffer_bytes_max = 32768, - .period_bytes_min = 256, - .period_bytes_max = 16384, - .periods_min = 1, - .periods_max = PMAC_MAX_FRAGS, + .info = (SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_RESUME), + .formats = SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_8000_44100, + .rate_min = 7350, + .rate_max = 44100, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = 32768, + .period_bytes_min = 256, + .period_bytes_max = 16384, + .periods_min = 1, + .periods_max = PMAC_MAX_FRAGS, }; @@ -627,25 +627,25 @@ */ static snd_pcm_ops_t snd_pmac_playback_ops = { - .open = snd_pmac_playback_open, - .close = snd_pmac_playback_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_pmac_pcm_hw_params, - .hw_free = snd_pmac_pcm_hw_free, - .prepare = snd_pmac_playback_prepare, - .trigger = snd_pmac_playback_trigger, - .pointer = snd_pmac_playback_pointer, + .open = snd_pmac_playback_open, + .close = snd_pmac_playback_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_pmac_pcm_hw_params, + .hw_free = snd_pmac_pcm_hw_free, + .prepare = snd_pmac_playback_prepare, + .trigger = snd_pmac_playback_trigger, + .pointer = snd_pmac_playback_pointer, }; static snd_pcm_ops_t snd_pmac_capture_ops = { - .open = snd_pmac_capture_open, - .close = snd_pmac_capture_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = snd_pmac_pcm_hw_params, - .hw_free = snd_pmac_pcm_hw_free, - .prepare = snd_pmac_capture_prepare, - .trigger = snd_pmac_capture_trigger, - .pointer = snd_pmac_capture_pointer, + .open = snd_pmac_capture_open, + .close = snd_pmac_capture_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_pmac_pcm_hw_params, + .hw_free = snd_pmac_pcm_hw_free, + .prepare = snd_pmac_capture_prepare, + .trigger = snd_pmac_capture_trigger, + .pointer = snd_pmac_capture_pointer, }; static void pmac_pcm_free(snd_pcm_t *pcm) @@ -1305,7 +1305,7 @@ struct device_node *np; int i, err; static snd_device_ops_t ops = { - .dev_free = snd_pmac_dev_free, + .dev_free = snd_pmac_dev_free, }; snd_runtime_check(chip_return, return -EINVAL); diff -Nru a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c --- a/sound/ppc/tumbler.c Tue Oct 1 17:07:16 2002 +++ b/sound/ppc/tumbler.c Tue Oct 1 17:07:16 2002 @@ -494,13 +494,13 @@ .name = "Master Playback Volume", .info = tumbler_info_master_volume, .get = tumbler_get_master_volume, - put: tumbler_put_master_volume + .put = tumbler_put_master_volume }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Master Playback Switch", .info = snd_pmac_boolean_stereo_info, .get = tumbler_get_master_switch, - put: tumbler_put_master_switch + .put = tumbler_put_master_switch }, DEFINE_MONO("Tone Control - Bass", bass), DEFINE_MONO("Tone Control - Treble", treble), @@ -510,13 +510,13 @@ .name = "DRC Switch", .info = snd_pmac_boolean_mono_info, .get = tumbler_get_drc_switch, - put: tumbler_put_drc_switch + .put = tumbler_put_drc_switch }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "DRC Range", .info = tumbler_info_drc_value, .get = tumbler_get_drc_value, - put: tumbler_put_drc_value + .put = tumbler_put_drc_value }, }; diff -Nru a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c --- a/sound/usb/usbaudio.c Tue Oct 1 17:07:16 2002 +++ b/sound/usb/usbaudio.c Tue Oct 1 17:07:16 2002 @@ -1840,7 +1840,7 @@ snd_usb_audio_t *chip; int err, len; static snd_device_ops_t ops = { - dev_free: snd_usb_audio_dev_free, + .dev_free = snd_usb_audio_dev_free, }; *rchip = NULL; diff -Nru a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c --- a/sound/usb/usbmidi.c Tue Oct 1 17:07:16 2002 +++ b/sound/usb/usbmidi.c Tue Oct 1 17:07:16 2002 @@ -60,10 +60,13 @@ "{Roland/EDIROL,SC-8820}," "{Roland/EDIROL,SC-8850}," "{Roland/EDIROL,SC-D70}," + "{Roland/EDIROL,SD-20}," + "{Roland/EDIROL,SD-80}," "{Roland/EDIROL,SD-90}," "{Roland/EDIROL,SK-500}," "{Roland/EDIROL,U-8}," "{Roland/EDIROL,UA-100(G)}," + "{Roland/EDIROL,UA-700}," "{Roland/EDIROL,UM-1(S)}," "{Roland/EDIROL,UM-2(E)}," "{Roland/EDIROL,UM-4}," @@ -1304,6 +1307,21 @@ .ifnum = 0, .endpoints = {{ -1, 0x003f, 0x003f }} }; +static usbmidi_device_info_t snd_usbmidi_roland_sd20_info = { + .vendor = "EDIROL", .product = "SD-20", + .ifnum = 0, + .endpoints = {{ -1, 0x0003, 0x0007 }} +}; +static usbmidi_device_info_t snd_usbmidi_roland_sd80_info = { + .vendor = "EDIROL", .product = "SD-80", + .ifnum = 0, + .endpoints = {{ -1, 0x000f, 0x000f }} +}; +static usbmidi_device_info_t snd_usbmidi_roland_ua700_info = { + .vendor = "EDIROL", .product = "UA-700", + .ifnum = 3, + .endpoints = {{ -1, 0x0003, 0x0003 }} +}; #define USBMIDI_NONCOMPLIANT_DEVICE(vid, pid, name) \ USB_DEVICE(vid, pid), \ @@ -1329,6 +1347,9 @@ { USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0014, roland_um880) }, { USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0016, roland_sd90) }, { USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0023, roland_um550) }, + { USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0027, roland_sd20) }, + { USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x0029, roland_sd80) }, + { USBMIDI_NONCOMPLIANT_DEVICE(0x0582, 0x002b, roland_ua700) }, { /* terminator */ } }; diff -Nru a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c --- a/sound/usb/usbmixer.c Tue Oct 1 17:07:16 2002 +++ b/sound/usb/usbmixer.c Tue Oct 1 17:07:16 2002 @@ -572,11 +572,11 @@ } static snd_kcontrol_new_t usb_feature_unit_ctl = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "", /* will be filled later manually */ - info: mixer_ctl_feature_info, - get: mixer_ctl_feature_get, - put: mixer_ctl_feature_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", /* will be filled later manually */ + .info = mixer_ctl_feature_info, + .get = mixer_ctl_feature_get, + .put = mixer_ctl_feature_put, }; @@ -865,11 +865,11 @@ /* alsa control interface for processing/extension unit */ static snd_kcontrol_new_t mixer_procunit_ctl = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "", /* will be filled later */ - info: mixer_ctl_feature_info, - get: mixer_ctl_procunit_get, - put: mixer_ctl_procunit_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", /* will be filled later */ + .info = mixer_ctl_feature_info, + .get = mixer_ctl_procunit_get, + .put = mixer_ctl_procunit_put, }; @@ -1095,11 +1095,11 @@ /* alsa control interface for selector unit */ static snd_kcontrol_new_t mixer_selectunit_ctl = { - iface: SNDRV_CTL_ELEM_IFACE_MIXER, - name: "", /* will be filled later */ - info: mixer_ctl_selector_info, - get: mixer_ctl_selector_get, - put: mixer_ctl_selector_put, + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "", /* will be filled later */ + .info = mixer_ctl_selector_info, + .get = mixer_ctl_selector_get, + .put = mixer_ctl_selector_put, }; =================================================================== This BitKeeper patch contains the following changesets: 1.648 ## Wrapped with gzip_uu ## begin 664 bkpatch22938 M'XL(`"6ZF3T``^Q=>6_;2);_V_X41!I8=,_$=MU',!F,VW;W:#N)`]L)>A<# M"!19=(CH,'2DG5G.=]]7591,2E64+3O=F>SVH9)8CX^O7OW>40?+WR7O9F;Z M8N_&3,WM_G?)WR>S^8N]V6)F#K-_PN^+R01^'WV8C,R1HSD:?#P:EN/%[<%L MLACGS>_[0/\VG6:SOZ7S#\/)^'`^3<>SD9FGA]ED5*U(*X(0@7\YEA1Q M46&!F*PRG&.<,FQR1)@2;-\)^K>Z$6MW8X0PDH1C57%.)-T_3?"A8"I!Y`BC M(X03C%Y@\0++/R/R`J&DQ2SY,Q/)`=K_,7E:B4_VL^3XU>5QLKC)T[E)[%U' M2!UAGKR`JB0Y2$ZT3F;SZ2*;+Z8F*/3OM79R_ MJFMG^[\DH"]!]]_>]=K^P0/_V=]'*=K_:UN?E0?18C:P_X_*O#S,FMV$&:]` M8015(I49&0@L68$Q!UT\@(_"A*(**:EB`MQDY=%T9"BI;T.,:(0)HZ)"@!)> MF5RD>88Y30>%0FE^+R[+AV-4`1.F5@]WG^W[LAD3M[=UT1^6@Z4D!%.L*905 MQDB@2@V,,$;+3*$BI?D@*DF,XTHJ7@EH'(])E0$^CB:SV=&HO#73/GQ;%PE7 M1&&,*T5R;;@JN,$@G0HK)\JNE@NH1H M*:+HNL*)2,"])B ML^H565$A5*)83YK;!**XXT1EV1 MT,RP4*HN(I&0(D`<90Q^"<@_#.)&1@#3P7&E)VBE4#HJE6W7Q\GTVO;HZDO` ME+AB%%P=H44N*'AE/!`#$]54C.-*5Y#8:=01'8''IS)5A&X$*`B06'):L4P: M@(^4J=$9H3PJ2YM/`[_4NLDN"6:3<9E]*@=F(X>"FPE2NM)$JH+(G`V(&0S2 M2)0.L5K)`>D8[?`N=7:J!2?+,B`,R((J0UG.U0"07$B#\[0KVPWP6_4-J01C MO!/'D/?,!OUFWM.01D#N1JHT0[C`AFAP_@J1L#1A7BOLPL@+6':BQ'NICXQ3 M'/=[@HG*P/!`:ZD89B0K=#RAB7%<]1@@$)*2>'2$N)JG61H`KF3031D$!%3D MM-`R+\`2HL&YP635-Z+B2L:S;7M;^EN:;0`6'@X#9UUE&F5J4/"4H(&@@W"& MO6%FL`P&1<"TK(24`PK2*$C:8;@4L><-/LWT4I/X-(-UD=>+F?T_ MYG"98AI7@S3/,53<%0%'`]D_I`H<])(/ M*&`822UP5"LA;@W<_L3/XA(]5"!8P& M`UHKGJH4%5CDU$B(RO%HW&*S0BDX#RB[$X-AR1G'RS*0%@@!,*%LP"3-$>1. ME*LL/D@-\UOU#7A8C3H&[<"A&*G0%`X"T[S5(+=I$2F]YK,N&/7G&8!SIW)]?IL2#@68FJ9 M"4/2C"$8*^:9RCO`$N?9,"(&D4M%XDX]HYS,J:HP@+9`)DT+ M612P_?/`;\F.$9@Q`J;O(#!!\E8KB-CUDU& MC52.V#'=O?U\L']`&JHYJ^P0"*?&9(9E:1JWH2C'E5B\HGB+PW=98<",(!N! M'N(,T5RS`4IY1O.XHVUR:;A[)C!C;J4KX@?MNM=3>M_]!WI?"T08%H%5,+<( M1FA[#8R\H#B\!D:2`_)%EL#>N=6O/+&?1_-R9)9R)\5T,DKF'XQ?)3MY?YG, MI\;L_Y+XZ'&>'$Q_<_\='.R_C6E\AS6K4Y*0_1Z%C^]R4Y1CDYRGQU5GR+/G^ZL,B.5Y<)Y@G6+\`#7/J MUOF2=U*O7SV^;Z\^A]JI&9IT9H"@75]?MR3E M))L/-PC<5?LTS9TQ:`'%GNVK$8P2@?R9HWUF.13PN!E<^H\V"W?Y>0/C[1GJ M*+IWF1'?#SGJV(RXX-R.`85@)`QESL)05LF!^B:@[!8#@E!NZVP7$$MD,>P^ M_R[W?CH^.>N_[OUZ=O$\.1RG(TMS:TOX M68YS?=@JM2=S4DONV+OB":66TK.5 MG5(/TMDL+JRMM3)"GF&9^>+I9(3P[]BZ(BXC9`N#80<0?#W(V7!1X=T!<5_U MF/T)8:>U;7\">"_&*LJE"GHO\%NQ#`Y#"H>_"?_E=V>$'5A8?SN%8^'0ZXNG M0R^5V(54:=/,%GIK@2UV9^7X>@V[=:U%[K+V'_;^FVGY"7+G/O3IPCYZ:JZ3 M*OE^]J$LYLE?_I*H'^Q/\!\?[2\LW,]R#!FRJR;L!VNJS#M!]L1.D('W(Y:M MWMK8K+NUV=,VUT<47SQA10"Y4^N+I5"20M96>P*A#174ZD)?7Y3P=QC2U3A54&+@CUTC7).9 ML$FNNWN"AUT>=TV:+.96YC3+%IOMX:X]+9)@8^A=6Q1VF:@OGJXM"KOI`85I M1_>4)M-D+,9=\8081V[4KY!8QW@M<"1%J6N_4(JBA(O9 MOGC"Q@H7LY78B-F-Q@9B=J.Q7T?,;GN(M77:3N^PTPIQU#-$5XBM5^`5P@KI MB%>@7[]7D(_Q"FYQ/.H4UA2WVYC%#UF>=L2B_!S@NGU<%SCF"6S55C?@[;^% M9%5;NC?TI[5SUPJUT8HRF\5,W%9MM6\PB^F&];6VI77:W@Z;X:*6%]D,!W;' M<865D,J_^K1A=^+KG_!\E-WYC8!1PVOI;1>S$VZP).J9OFWAKG;R37?NIB'] MS!N182Y;XHBK7G^$I[N[NAE'_F4G)%RB[(NP^-@Q,]?D8<^K'\`I23@,^L`M M<;OBL-V>@:HVZ&[, M>YT":BS!G9&O$T#17+4(;F:/6O0CMM('K7K+5GIKV:*R!B><9>.-]5P<2;1Y M`URU`2&\IA5B'#-'6(W`1O)`0':!YA^$Y!U M^[^W(+:EOMTPFS`(200^GRR'2I(6=+V,#KRM/*\!84\221+KV@;,3=35Y3(# MV-O;^]Z;U=L3L*@W/YWW7[\^?@LX7+O:>W-U=O'J[/C]V6E2.7:B9N>W"A63 MZ2B=VTTX388_O;[ZL7?5?Z=:#.NKEUCT7YW5W&#@XMAQ]V7O<`K6X[C=W79Q M?'76/SE_<]5[\^[\W66+I:M3"*$^LY_/:PXPHG)[DUCK6GKKKBT);4>,S7"V M),;MBYZ:V(N#15&8:7_P&62K*[XG7/P)`WA^<`F2F9:3?$G@V`FV61&]LRW# MZIH7P=*ZW4ZE"W?_M+:_!RT`]0D_L;[BQ% MO=5N[_`#C#W3:3J:A6Y?5=:4S>BS1N=#$#1R:N"6(%5=9:GF$/&NW3[#)55] MQ;&8V-?:IT$6OLHI22&O)"6#2LK\""BJHV7];BI:WKU%0PVRN(*61+OK9\7A M3CV2<+MC$TH)Y=-D5/_8;Z53/C;U9S=Y6?@YD%8BU:JV$R"0)C43J5:]G?_8 M3*%<:;=T$49=>D@@]+#&,/?X52^Q7/P`-^_/4[NY:O6`?IG/O,XG@^9E]]MO M51U-/MF:OLVCS&TY[]]\OZ3RE6#.]OEN'A=*[;:D0EX`L,H;+.LKGNEL,6H^ MSE]83]"69P1TYF4/.X\@FHYMGD=@)W'L8BFD1#X+(QOSLY&#J2`)^VIRL$?- MS_K#&*(YV%)G.VWFY\AO0O3E9O+NF4>3]\"12MTPV?50ISABN@YULN!1%1<, M\5@*SV,3*LK.J'PU$_SZ,0#RIUK%`;2IPIW2>.+WQ]3EUE3/WL%]XN_++=G< M93";LSF>XR1\)D>$^!*9'.=?,DM/_I1TY7(GETS\^FO_[=E%[_RT?]G[[[-( M;M=%N)*N)OKIXOCGRP>E>T3B>@T&W[=_[?YKXK9Y"_NEU<.1Q/SY']MWY-OL M._M&C,U"J6YGH7OUMBMK^=%T/4BTD8\ZJIML9#U(."D-\HEDIC':S?0T2!G, M48.4P80U2)F74Y/-F\DK@SBB0:L,_+/^?ZV&M9I-;CY'E6(K[Z%ZR.LWE8^I M@S0C*`KIV.`J1/-(U6\9:45(NQ7?.>(*$6X%\Y(PH$["/)8IB6+Y_[`Z0RA> M-;43Q$NJ$(8EA%+N7BCB.RR>GAZ?)._=FUKK"Z?UHS]-AH%%_T;EQGI_H\XM M]5L15?W.DW)1?WWL^^,Q[K]]?_[*T2H_.^?+3=KO7Q]?7IU=0$/ZER<_]H]/ M3R^2/R?H]NP'MYS@67"O$:5WT,CQZ>^A$>WS(%^&-7*RU(BF-2T-:^3]\47O M].RD]]KF,%&E:.64HA#942FK=7:WGWI=.?Z]U,%D,C3I.*Z?-,]6:([IJ4D# ME2"\W2_KA=^E1RW>1XZWFV"=^DJ87')!%6>"RA?*CPO;.31'.5G+NM^8^3 MO]X0'Q.]KG80W819G3U)Z5ZUK'=FG= MV<]O>^?)S`PA6D5:9:YO2AAB.))X\UI4L7:VB"(-=F,8Q81O%,<[-\IUV)&W MQQW1Z>7M;DVD&3\>H[Z3X_3"-8BSND%ZYP:=O#Z_/#JWN5H^3^ M4:+VF&(7C^D;=3X^.B^*/[`ME[XI4OC(!>G,PR/7^(< MT:/IUB)A-;9+XI(78-^VI?=N<;AZ-4:O&_I6`Y5MDH=6H`-DJR6\O M!`4H5ZDTB$)Y+8KL%,7O6]DFB:>ZAR">\$X.BB5S^U9\&9C[]C?'YKXWSJSL MG/G>\<3,Z+QWA-_R&$=M#S.M][UN[&C'D1WM+#E@W\2$MS\M-#KAO:&[G99. MW!:P'K2_M=)W]OH=1K_@H^-%7EY_#JWW+4]0"ZSY9>GTKG[[XE^+?+4*V(G2 MQLGX#X'K@T_JOR]N@R?U"RJ9_6,)6,OP*0XQ`&.4'.`O\\=H?F\(^[]3<%\( M-]2XTQL:,#A%_@@9M!\Y6\D%(DA*[5_'>;FW^KZV56">3AL5=\ZX_G97=7?X M4OWMKJK^DS\O]_R7!CLS'95C7[?Z?E=MG?1*P+L?MFJ6CFZ&IC\VO]6^?:FW MNXH&62,&K-'=(P[49^\]R+H><$#CO0UK_0A`;U0,,>R-2FT8U;_!.OJC3,H? M3GEOD_(*W&EW.?7'0[AB,Z]8/N`>B84]J/:^2+K_$;GWP5#[B%P+'E8)CCE^ M&'AT1P5:3MY';7;;>ZV/.!'^/H:[^8*KL]W_ M;>_;F^.VL7S_5CY%E^_6+3MEQ<0;G'NW[LJ2,NF-9+LL)S-S:ZI45#=E]4:O M4DN)4M/9S[[``4@"!$"R'[)DQZY*:#=_`'$.0/#@/)E4QQQX=T7P[LKXNZM= M8+X0#QB3#W_(^[M&G&M.M;8`5/5;WQ6323G7+U%+6;"SN[M_='3\?G]GSV@O M08-9:1;LGRX%0]W&GCC"-F]V#O>/Q_N[.9//GSU[^>Y@YQ^O=W9_?'FX<_3C M"_>A1O-0_?'$G<97LL$;140'WN;>^>6;/91!3"#*=$Q@F\HV2S9$WM[^]SL_ M'7QX:`H=N%&[=,#!AJ`.Y5HAAC.CY!NP,/[V?OQAO_9P:2/&;W9V/XQ_WM_L M\JD.KJ-WNX>C(^TS^O[J[G9V^?'90'ZJ)L>NV\HP68#6$0OQ M>3&Y-AT,YK%)S;DLBVVKY3AL&P&#"8%53,CGLXJ7XFUQ>WNY!%,!/IB;@#9L MS$&E3#-/H]RY(U:ZI:VM9T>O1P>S7\O1SF5Q?O7QU9Y)75:9%_]3R2>.2MF7 M8^9G2HR:>MN>52UWX%SU<@<,**/&S$M]*^]0RHRZ["D2EI;S;!7,P8+>4G4X M!XEZ01U.(^M1GF&14/U^!HG(USOD0PW209*>Y=Y*RE](,#[&.0XL&+7ZH,>: M$L,EK!@QJ&-/R8492]X]EK0Y)0(;,I*6027YHD`1DZ%OR1(%5(:\(JT"*OK] M8`O"26Y2[^5#WP\E7FR+AZGQ\,G?$"@?,^0-`>:M%`I`*01U40Y+$_EP M<\)IYY00F9R3L*4?]-":$AR=C]Q&P^=5,'Q443E,0[DQU>12.LDEE)%+:"$' MA!.$O5:JQ):F4A,^_Z@F7]<(`?UDW0:,5+/S\G)2NFQJT/8F/+[X6";ZU+?T M9'*L/>AS".-.3&6GRW<;M.Y$#G'ZCF![IK'?[;N-[)_$2"1S9N,1LE@\0KO= MQ6PRC*4:^*=F*\J,[S-"`WR?U=[L>9-]__<1V(#G(RT8M/VMZC=2<;(\O3?F MXCFH,"/>5UWHP`^K"VP\BQ'BL%QT!J;>Y:*[&+1<-/!/O%Q:9Q!;X++[[+%4 M,<0UR4$]2S+3HNN%"0MR)?(HT;\BA$,YN$]K-.T0J($N$:<.DRSQJ=C#W.F MK5]CS+D.\MIJ/DO_>?7[_'9F=)H]'[3=G?=[!N5\MLRC_LOV4GVJO&]5"V*^ M3]X'JH6P;L*"4_!J%%SX;HU'&CYZOG]T-#HL2K4/7+V(.C>:;B.^C17G>[T: M+=#):B(X%/W`0F21K"86GTIL4G<7RVUB*_YV?B"6JBW\S2_%[#]NK]%W-W=G M-]MWE[/MDZO)V=V%6BZI+ADFB"LQARY0GF4\;J-/?2IH-MJF3\;C<;WT[U!F M.?FIL#Q;25LK"&A(!?,42?H0?^0HDP(EDEY[TOBJ2^$UW?UAY\V;_0.W=76" M;W7`$"1'-)=U%1B,4.-81C?0&<\@)8"NT-/^>@*ONS^>+O@4'M8XTS:( ML?[@K9'+J_[0F<=TI=`UB$0&73N;#U-O162@G!89WS2IB4RY#:F11+D-J9UY M(;%=!BP%]'Q>G;[8UFJ M3_"K:7E>WI;35XJ$\^W9I$0"X>\F_\V%."$89Y+GDF$E%W3)-'6S0*HA2(I% MNZ_DJ=?OQYC8$-%5U!&U)3@C"=L2-C:,A"["*;X,:297STY+,S7C5JLB#"4C M]-ZS^EMWJ!T=1Q^N1CN[N6B_='9XNCC>Q>P>7*W*)AN__Q*FL8%6+`TUQP_) M(4A1"A.CJ)V0P(2AFA?7QY.YI%@8.-S< MAN%"$(L"E[_='\_PY!C^#9KWVZMK[_>K:_VS2>LQN[IT[M6_0;OR]GQV"6.L MV]J?+"N54##YQ;E=_61O3XO;PK^K?X'TNA397,>#CJN/6.?Q.`"M=NRKNNDX^#F0^-$O&$KR]!<@DP?`L$\W MX36R":_#PW+03DW&(/8IW!/BH!K-<"8J\'`^ZIX=5N;8L#+/DZSLTCRT,8_/ MPEX-1!O8R[I83G%)3$YQN;S"#^729.PRU[6W\%P*LX7GN1S@=$1PSV;]XYNW M'Q+;=,X';M,U,-BF6[]6VV1JH^XK,(&RT;9,0/$(K63H_TRHT]JP[X0&/OXN MYPVG_TNA0$M\:767]5Z',Y/8%V=Y6E)I-MUN+KJXQV>B.YK-\-#KL6&A-J

!V]W7?H_W]=^_?'H(>I8J-2D0^F=#/J+JE+-70+CIT+!:@ M;FC[,B+&OHR\RHM;\9@;WS6J^;-,8*4?@5,-RL3*3,O3XN[\-A:"$P>&,3AQ MG(GOXY`/5!$+U2:=`+3.`-L^IK2U8\NP11V;CFU(;1=?0F^R%&IB6+*G4[\` MK<*F^WQ\6M7:WBRMUQ6M.O,M!&[*S`\LW$!DX<.]$OHC?O1!C>6PAR/SVYNR MN.CGB<7UO1,69D->)35F;=FR0=W#7T)[4[TQW9N_^2:HZDF0(,^4R6F9H#P$ M5,J)Z';K_'IQ$Q2(VC%3$C99]L;J2E=0:Q^JK6(V^G"C/I$C,V&CPV*N=OB4 M:EM_!.KUJ'`=NVX`32JV`Z0)^LP(I'E6UU72//_PZF^C=_;S#U'9@8W,?;Q1 MJG<38Q7O$&S938R'-$IZ145NJ*%D!6KLY#P$06%L9R>P(D?:R9&K3(Z[[DS` M\>A]T4V0#:L&Z;Z;+!?9298+-$L.&>%`75:+)SEY7QV._MU=OM[(B-G+7=I MRXM.4GLY[YHS#Y:<,`^5R$1JQU; MI:+^C$A_^].'BG;,P=^`8+&*P\&#S?IPP*V&9HPN)B0GDU-!3T[1%/&3=(Z'5D=U M+3NV0(Q4?C5DJ%^-^D)NBR>3V'<]KQJ$N[([-'Q;*0LJAHAQ*DJ9CHUN"EBEE`)DZ0J.-)R-74P-WXL?"-N+-QZL?`A3BQ?><\Y M-UZ[,NKC3AV+6446;5G-N`#'+5WK.-8%CW3!6UT(!F9CP2)68_M:]YC<`U14 MAQW"TMKL"MJESG8P"7UV\,"T-CN`IG7:8:^U1ML$Q(T%CUB-JV:=9N,VJ)N1 M=8&K3\3'?AMR&]G/Q="*+!DD\367=7-^@)[TAY1B$Q M`41=]"S@6"1]$CAL(6ODIU[,^IG#%[1&#U_4T'?C'D&0<5(SUXA@7K5WW>$9 M,FX1YNJ>J158G=E_>`8H8:JY,V'BI0+4R(U]#$3YZL%-:&-$J`]`5KSW1?9? MKFX^(B4NUG_ID=TC^$"(9Y*2A8[L/IUR@I2L>%M)MX\GG@#$*I.N29!^KJRIE^HBZBF/G]F-W4Z0?:O6R# M]/;J@LR'H0;YWP?[ZX^:Q<=-8&,$[72;1(=?E!K]^J?O;5WC&AU^7FJT+83\ M^A_@LY5HX?7?V<(GUFL1!;LL3(&=[U;#;'`B0]*N.;C6#99<>M(N/:F77O/4 M55?@5O"\]M++[=+#V=>E][DN/8P@!E.7DU+7AI7V2)88J3V-:,Q9'3`O!5D:KT:ZH5J.M>%:#VE):#72DM(;3GBC6 MC*`2OVJ@+X75P%KR:GKT!+"FQTKH9+P!%1>4V_T/Q.,;XMO`;*2'K MZJ;..RDFJN[0B)UHXG2ZJU-BZ8UENA,?#J9FHH M`X"NQ\O,[&'T1]7Y8:?(> MN&='OU].FMP"R\W07+5M5048-#?0SBL/,&A2H)FM,B^IL,6!\5-B=JL`0\AN M76U^Y_:VO+PK=/SSTBRWOF8K,-WU9UN*[9Y[&R:9A!186CWFVJ"K9C'-52,7 MA0HK1]KI,T/7T(0=^L)DWB(]NJP&%JBP.!-TP4X)HFS",,4Y0QU)#5L=U?D= MQ()E3*"$Y@HE-%>8C+;QD]%S\IVU?MG8@^9N)Q!0NC7!2ZZV#CW/YB^(&9 MR69CKZ$*7[5P,Q&*+#=9_1#VMC2;R8_$MC35160STT/IW<84R,W>AZC)WJ?> MO3![G\*F,O=!-[&L?9<7F''S_YZ=T$,&FZ$0@B^FTU-:9BBOQP MWC<_'1X?[1R^.]@W@;VCQLG`E.N-Q?=*GNM#B!3Z'.EO)##"[MVU!5EM0[&= MM/<4?\]H0,EMHS68Y/;1PCDF;B%&8)26\&*ZZI,VH;9(IJ^1:H$:=924!)@L M\P23NS9L'_$46-SK1N##'`;G8&DUEQB#V\HIDDMCFLWCI8--*]34^1'=YRI7>3-[AFGU76/[O(&GMOJJL]AN M?W-1YGW[O,4$.WPN$%D@1C,RS>E)5K`)F:8MMEXO9F\7&5D0@9(IO%%B!J1ZU6)QUJLA`95Y>U<,G#60N7/)VU^XL[#+29 M$3WQMEGK.&!DN?6+$4&9%=.J.NOUS<=Z)U^_C][9Z*S?%,)ZYJ+WH-SJK6LF MVD=CAJUS&B-9[YHOID6\U.W7);_!)4^H6?)*SNE>\CW3\77%QU8\)B;-M[KR M_I+J7BX;-]_-LEF=[%@JBW2JK'H,%F:OB:%,\AJ2@2\!)HCZ>7\VF?9G,YSJ M2/83HR^=\J<#/8QU7OH?@H3A(,9#.=C+FU96@2'<2:;!BA&02A"5Q%9\:>>( M@'$<[^P?9<=OWK[9^6EO_!92-Q)LF4(>E2G)?%F/PQ1B"I$1JK-F5#+I<-^: M($66S:2Q>Z4.`I/;*R_'4O6GH0!J=T"^B]O?K^ND`F"N,1D*(FUT38^P2?6& MQ%KH=!-!BY&FGE)+O=P0]0=75]>0NPC8,(#X<]O`):23]%B#3LK;#33=#!FZ M&=L0W;M0I>#P:EH.H!GJ%UPH[/`)#YOTD1VT`+I-]CS"\8;HKES^(!_2?`#M M%WHP&CN<]K!)'^U!"TT[9Y;V?$.T^ZY\JC=STY6:/>SO.VU^QE90PFZ<R@ZCJD M0MVF2+BJ$W]VT0"H3B(4`JA`ILR>NGXB*K0'MA8HNJEH4"DJ*H2A(D>&BOP3 M+2?P([\I3_NI,*@N*C0"J"#$N)J8)%T/3\5U,9_?GMW<=;ZT+5"!L"$#BS`V0`9 M1C,(D-$UZSYS#6)`8H\.,84?RL%&CV@8*0TC&7FZBL2`ADZM61R]I-Y,,<0R MAC\J8[J5B8_"&($-8X3H3T'L*Q:>[5KW@=$']4&V)VFSK6;.L3K<`_4W_INM MU.9G[\9E!'-W#V,.WH;VVIO32[<0!&(7L*"C%>H`I1TU5(_@H:&ZU@6B6CYB M6Q$7C:7+-F$>=\J`M%O?=B3X0N'OJ78KU$C$ZC1N9B''0VC_HM`2SSM03];,ZS;JL(_&$^Y`.:RX+TGI$#>NFH\:HCG5^%5W/ MB2$:1+K5.WA']$0;\X7PLFT;%X2;B#8XDU9?%T?WJ:3\YS\4%Q?ES6EQ?OXB MJ0IET9C=AK1!ZE"6C-B=7UW.)K_.3LIYCR[4!09J4)S)?)&K3\8I%E-Z@LN3 MDR+_YI=B]A^WU^B[F[NSF^V[R]GVR=7D[.[BNVG9V2]3[S[7BI4%$CDVR:3% MT+@&)1%M,_E$=*%KYI(FG;FD7<:M5*2=PV?.7-;-'RIL/6?QM9SSD$RDG>6< ME\I$*DQ!9[&1>L["EG,6?ZIJSD]@%B6%A,B2A@F1F]>\6TB)X5;S5W-ZZG!6 M\U%Q3[78F)(?XQ@X^6&.]NRD1B;`3IYUL;-+2HG`GA`S>WW_(M@AK`P#1/,L M`S-3A@?8!8SJ8&F=NC,`XYQP=Q\H$AT,."-HB'.8=I?#'=P&&QD#&2QG^0"% MZH8&/Y]=?CP/M=^M\5>H-`E>/VV]QTWY49=2_$'\1+6"' M,D1!PYPA\>D8,KVZ.^EG2(5*,\3KI\V0\_+T]MAR1:WS,_./FC/`J&,-ZQ<^Z1>P0 M`/W%C@#F1O\!P.`2XK_:%:;EY6UU[3D#!.C@(*#C!A>,%`31DY),)_D)P].D M/T2B/XKS#&%*\@53?S?YIWG@#D'B!P`^VN9/1/Q?SQ6"93GJ<(4(>+?*&0`; MRQL&PUNS*#^8/NG>WXI?RYV[Z>PJMC+MDV-KL[K5OSHKI)./!4%689TF-HS2 MGQ0W39M4L+X'BL?LM[BG!+39Y7*+WS8)WP!!R&(B)BUC&LVIU>G4][ M7^P:M!Y;ZVX&,-3%=K.R1CX0$P4V3!2APKZ>S60:!1^QYJJ$/H8LQ@K8LP:- M!^/:7+/]-"S3/C(0^*J.0HY+UB`GM#K:J-\7[>AOXP^[/P2>:"V6NY6HO_&< MT.+`T&\QCDM4C,_NL02?%F:CWYA70'UK@!=G$W$U@`DI_U=_T-/RM+@[O^WG M0@7LXT*%L^'?T@;UY@B(W81S8IPE_0R)>B?Z@T]Y)490P(<]3,&O=XPIRQ[3 MOW<)-G2X^?IDIMU[H[B^A>&E!6`9!;8Q2+"PXD;P['U9W(S>%;=GSU*4%)-< M#'G3/5R:$@^6>,\I.$CQS-#'V1KT'=[-9Y..N$Y_<+^J,0T@U86E*751"4(1 M!TJ%I52L0ZG6,3]90N$LI$ND:SIU\>_5Z50OW^C[&_6X*+&;W3PBG-.6ZH'< M:T/3'&PC;84*K3W5#!,97I-A[XK+AEV[YBF?CE_7Q>50?KG0;GZY2,LOPWI;35ZK= M^?:OLX)+_MWDO[E@E$LQ*3(AIGI>NNQH52O?=V`K4RH MOMB"9UE.3`@]^1,ZC7*<9R)M*JNXMHIQC.60G=I4(9L1K2\?XT4 M-G()_"_;22L?4A3BI4&*(FS4?4ZYHM5=1;QQ:K?N%Y?K`KI^0JF93^)"5'"'YV(4DXF0A1E/L&$]0E_ MIEDH_0E&%NV^NJ0_MQ];YTJ[2G$D3<@0PH'XE\B@Q+@2_YZ*TZ`ZS:PA_A$I M24@B!`HJA`HE_? M7@'2!ZTLDD`WW2))!4F*)/Y0NF02']DEE+3Z?&0!DED!DJ7GJT>`]#"//UM# M!$@/V#M73T.`%'!8-I>H.`9C=<2Q/`=I+,]CPAB)%B6M>HG+86;A#I'#`)F( MV?C]XK2Y]#BMM["!U(6%(`O,N!#3$W*B[HJW-9J]4LAUP46]Q;J58#8DA5D,R;S7^H[@HSHK1WM'VW_\Z>K<[CJU*\]C8 MHH10"7N[?V&Z:"=@0T*53BQE*F##-NF,UZB[C85K>.P;$JP1:Q`L?I(SNM`9 M"U!1EI.23HHB75TWV6,5I\&R!49"TL0+P%+96['.WHJ_B)>`H.$OP1I1&B(' ML==/EBPC-TL$L1GF,F!*)3+F`XDW:3[X.J4;G%*4,>TZ/E:; M(_:<)+><3U+R)!,%!;)QOW`<[2PH;@<14;EY2@R*C#'^ZP=*!4;N6&G M($EV-DF5)IT<31XVEF-HCR]T`MK-SL[31PS8R\S0LQSIG.F:EPC)7EZ"X]=7 M9G8PT[[G:,A['O>*[H#^J=]YE!O6*GFOG[5T-"\Z/+$]0M..V#%8S^IPW;"1KL0#6>:Y?+AD,)7BH2,SCH4D MLN)4+_&0C#B01)V8-"N4#"GNL0&J$NEM'*HBJ6T_ M&E8HZ)G:[D=[=]?GLTE0)2F@YNY:H7T+N$M*?3M.B[V]IR0!*)Z(.#'%$^ML M-V=J5Y^.M//^JX/99;D]OAP=_3:[G9SUV^]KNL*Q?[R>J?7U6\1\WP($QOO6 M_807.(9P9@D.".JZ00\$^_P.!X0V(D5"V_U`R-P,-R?1X8YVIM,;M5%N9-B% MZFO`V`'62P"@K).O%GP@%S-<0ZV];>N[JUJ-T_7D5?%;,>E,;-I@`NV@>MGR MQ23/)O+DE!4X.^'DA,;5@ZU>:HT@6E":9ZG,+3RN$:2C;?I%:`,I(WDJ@5'# ML=72M-@L+?JRYB:?Z;U7O2XV5X&^1';BY_=J+X:,8,_O(7'8"YM=[`^=L`@2 M@9C+1D:CEKM=]4N.!GXQ.5*G._FB]$R=W-Q_5WW_O>2T:6/!F<(:R19%) MM;Q.Y2G&$SK-$TF^PHZ%B::W8/4_ MW]G;>X]?[QSM/]??BA>C_ZTZR^Y/3\T+X+X1Y@4UR6',95/LV,,,M@QSB;VD MS\_U,<6,Z<;\M7E+Y^HH6EZ]L*D&S3!-[BESV=@PB4E!92ZQ8;:9&1^=OX=, MBTG1LW\82+!W"/5!7$P$1=GIE)SF8JKVCRRY=SB=U/L&7C#)"%MNWR"C;?)% M[!M,"B'3^X9AV$KF9>W^!0E?M*!5OYRZ0R/A_H65@&$BPL2;E8%'DQX31G.1'Y1(H\N;"<3NJ%119J MNG.6D-9$0EH32ES[,K+L(<%ERGI;LVR5I46IDF/4]X@RJJ\=YCW?)5$!MMI. MB]8`F+IU_//.P3C5]OW^T4^'^Z!PZ4L>]7I_-9.A,0OZ95F,[4P0%IH%*^!: M^:((5A.7<'G$C*=\'CF1,7?'6)JH=X<[N\>'.W\__O[]SE^/U+F,LMS,J"!? M9_2+F%%.(->2V@>#A#8@FW6ZG/J(U3P831\*U>'"Z&+B/HS^2)(>C#XLZ;_8 MZJTV(.A$`)I9-$RA!$VZ_#T]P*.SJM?7TT-U,RIB&M26!V0M$#'U#;1+*6]N M[RY.SLN;'G&@1K4E`O4B8KG0\1"83)D@95[R*4]*!'X_CE"@9$U"$CFHY1>N MPF%$LE0TL75.7MU-"T0HKO\S:.#_;.5^HO^)L<2IH MH2181DY/9,EE/`8JVI59M(SIKE#EBML*@D=_82E/Q&RTC;(GLFPSOI9RA>-$ MX:0VWU;3KL">IO__ZMO1OXVG?QG5_;W\5;&<1ND!FD?[]]>C?]/.57N4ZYH: M8\KI.J4U:H6,'4*GK:W")(QMU>U>:]MO9XH6)4[9(@O,*T;AUU%`N%5'`Q.J2O__$A5H<4SF7ZYZ8.*4*4F8322.M!LF^"VID$]_G)18"K M'2%:G70<)$)D_#C1PG75W'1QR2-%N[]D^4TRI)"IQ]JZF*F:":E+PR+$>:PT M+&GJ>O;-QWHG.K^/WMGHS2CLPWKFHO=TU^JM:R9:95`1$IE=\R+O7?/%M+C] MNN0?>LE+8I9\CGJ6?,]T?%WQT14O.#%^-URGO]T:5'N^\LYQO`Q;CH.CVG-P MY/B5UE\P9S@VWYO9KZQ+3N4XF((9EYS*<3"%,GZ#PB3]A'(,7#>J_"T3WI1+ M^5MNGEN^HV4OPWQ_RSZ^>6Z7?>SSO"]U<0G@HB2#N=C/G\I%;BD.N6ZYO?QQ MO7/[N-,XZ6Z%+G5F*,<[^T?9\;OW;[]71([?OMDY4*O$O:4'MW_X[H>=H_$1 M.+5QP[8O+B_+B3KN/(L3#.?/ MF8;>_GY=5C1%Z=7GT#BR_0;I,VF`5`3)S/ABRHRM0-#!U=4U)/H$RKKH.;?( M7G*BP!@U;2`08[Q[=?#C\L3LGE\I2@ZOIF47(1.-NE"@7DKBR!@I`5*KQC+C M?YUG;IG+K:VZ\#W!K0!U=Z1>?+K[M'9D^E:DRCU)UKA7-W/.\*NSZ?RZ5\W@ M(,VAG>MS>T:07&`I\VQQDA/*'>2NI:3/,],%=706,1A,[Q`,S!D!XCF,0/NV]JL<]?:R=$`$ M/-THGJW8&>@@`0)ZYQKAZ"#A+JB=[5U3:A>;D6/RR4:N)K!OZ`!)CUW=-H.7 MP@Q>YI]@\+]?ZE+`Y6G'X!M(=/#5;1-&`YZC8W5E`SQ(UQS\=3&?WY[=W%5Z MYW!P+42$N@IA1D\EL%X7YGAPUI_/+LON9=,@8K15=TV@3P:Z1G4=8AY8<^07 MLWNU0R2';6_'Q@RWS(!E!D7YF$3J.M">`4\<(+DG3XS5>?*?,`)B1T#5-;G& M*DU(#]%M7'0U>AA@@W:;T>\+I]G0]V5M)OS\]F#GP_A@O_/5*HM?FK1G::I= M&'"5\\P0Q,G3(P@^<3W4`,:0(HDA1?*G1XH1&'IH,2`3II)Q($9D^9,BYN9B MWC.K4Z#!S&NT?09A3"U_,N'\J^7,ZT8 MWR&\24;?1PA(Q>"GH!57.I15;]Z^V?EI;_S6EM:U+!&/RA)7A??(+,&,FI`* M-[1C+ MS!1DUHD4VX[O9B/L<'SW`)\EPUJF7J*SAU%P6$)>2E:MZ_ZAN+@H;TZ+\_.1 M>K%B25D-K6%*5DM%7RY6@$44WG?S$_U?<3>=7:65W3[*JZ%%R0)11N0"34EY MFI5%<2I.3]579NF.Z())R4PUAJ`8`TEXUJ'1-OHB%-Q,YB013NG]U7BCJ]_?&[]\>V+OS[]3"D$(FTF)XG%IA M68PYUF+'UK-_>0]_>;2WC;,_7CZ+WY)P:\PY+*0VX*>=;9$9!"(9U^%^\]OB M=C89V9$>&]+,\?EV9!]FMY.54,4CNE><8SK6>[ MN9JJ]TO_"*.U:6DN[RY&4!AAZSO5"#9G??C_U[_4+O%RE-TK$8?8JQC]\<\2.3TTR6%NV_C7ZZ>CU MX7AOK,\INV\/WQV,=]Y\.-[;_WF\N_]B%R(J9!+]\-U>G". MEOP:,C55[*E\#]%Z&4]RP7OVO?M5@\F8R>C(_(2.`Q.D/8/\Q[_-E*RFI+!3 M=2VGH_-""X<7Q>6=DN%^-^F0[6L(XSQ60NKQ:5F`1.BGO@KO>SFOPMM&4R0Y M^(%(L4J2MPX:5ANZVE,F=VIF4V.O[U?ESDS.&:2.>)]B^&K)@C=2BTGO\SO+OX]1^4)GV33;_X'>KW*6'&W`0`` ` end