Skip to content

L
linux
Commit 16a8f371 authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Jaroslav Kysela
Browse files
Options

[PATCH] ALSA update [5/12] - 2002/08/15 

  - C99 structure initializers - second set of changes
  - USB MIDI driver
    - more device info for Roland/EDIROL devices
parent a3954fd2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1934 additions and 1914 deletions
include/sound/version.h
View file @ 16a8f371
/* 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)"
sound/core/oss/mixer_oss.c
View file @ 16a8f371
......@@ -383,17 +383,17 @@ int snd_mixer_oss_ioctl_card(snd_card_t *card, unsigned int cmd, unsigned long a
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,
};
/*
......
sound/i2c/l3/uda1341.c
View file @ 16a8f371
......@@ -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 <sound/driver.h>
#include <linux/module.h>
......@@ -459,9 +459,9 @@ static void snd_uda1341_proc_done(struct l3_client *clnt)
/* {{{ 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 @@ static int snd_uda1341_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
/* {{{ 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 @@ static int snd_uda1341_put_enum(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
/* {{{ 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) \
}
......
sound/i2c/tea6330t.c
View file @ 16a8f371
......@@ -67,9 +67,9 @@ static void snd_tea6330t_set(tea6330t_t *tea,
#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 @@ static int snd_tea6330t_put_master_volume(snd_kcontrol_t * kcontrol, snd_ctl_ele
}
#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 @@ static int snd_tea6330t_put_master_switch(snd_kcontrol_t * kcontrol, snd_ctl_ele
}
#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 @@ static int snd_tea6330t_put_bass(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
#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)
{
......
sound/isa/cs423x/cs4236_lib.c
View file @ 16a8f371
......@@ -366,10 +366,10 @@ int snd_cs4236_pcm(cs4231_t *chip, int device, snd_pcm_t **rpcm)
*/
#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 @@ static int snd_cs4236_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
#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 @@ static int snd_cs4236_put_singlec(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
}
#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 @@ static int snd_cs4236_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
#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 @@ static int snd_cs4236_put_double1(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
}
#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 @@ static int snd_cs4236_put_master_digital(snd_kcontrol_t * kcontrol, snd_ctl_elem
}
#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 @@ CS4231_DOUBLE("Analog Loopback Switch", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT
};
#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)
{
......
sound/isa/es1688/es1688_lib.c
View file @ 16a8f371
......@@ -800,10 +800,10 @@ static int snd_es1688_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
}
#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 @@ static int snd_es1688_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
#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)
{
......
sound/isa/gus/gus_mixer.c
View file @ 16a8f371
......@@ -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 @@ static int snd_gf1_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
}
#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)
{
......
sound/isa/sb/sb_mixer.c
View file @ 16a8f371
......@@ -65,7 +65,7 @@ unsigned char snd_sbmixer_read(sb_t *chip, unsigned char reg)
.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 @@ static int snd_sbmixer_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
.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 @@ static int snd_sb8mixer_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
.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("Line Playback Switch", SB_DT019X_OUTPUT_SW1, SB_DT019X_OUTPUT_SW1, 4,
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,
},
};
......
sound/pci/ac97/ac97_codec.c
View file @ 16a8f371
......@@ -590,11 +590,11 @@ AC97_DOUBLE("PCM Playback Volume", AC97_PCM, 8, 0, 31, 1)
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)
......
sound/pci/ac97/ak4531_codec.c
View file @ 16a8f371
......@@ -56,10 +56,10 @@ static void snd_ak4531_dump(ak4531_t *ak4531)
*/
#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 @@ static int snd_ak4531_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
#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 @@ static int snd_ak4531_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
#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 snd_ak4531_mixer(snd_card_t * card, ak4531_t * _ak4531, ak4531_t ** rak4531)
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);
......
sound/pci/ali5451/ali5451.c
View file @ 16a8f371
......@@ -1540,22 +1540,22 @@ static snd_pcm_uframes_t snd_ali_capture_pointer(snd_pcm_substream_t *substream)
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_playback =
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 int snd_ali_capture_close(snd_pcm_substream_t * substream)
}
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 @@ static int __devinit snd_ali_pcm(ali_t * codec, int device, snd_pcm_t ** rpcm)
}
#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 void __devexit snd_ali_remove(struct pci_dev *pci)
}
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
};
......
sound/pci/cmipci.c
View file @ 16a8f371
......@@ -2506,7 +2506,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card,
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;
......
sound/pci/cs46xx/cs46xx_lib.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/emu10k1/emu10k1.c
View file @ 16a8f371
......@@ -199,10 +199,10 @@ static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci)
}
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)
......
sound/pci/emu10k1/emu10k1_callback.c
View file @ 16a8f371
......@@ -60,16 +60,16 @@ static void set_filterQ(emu10k1_t *hw, snd_emux_voice_t *vp);
* 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
......
sound/pci/emu10k1/emu10k1_main.c
View file @ 16a8f371
......@@ -535,7 +535,7 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
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;
......
sound/pci/emu10k1/emufx.c
View file @ 16a8f371
......@@ -739,15 +739,15 @@ static int snd_emu10k1_fx8010_playback_close(snd_pcm_substream_t * substream)
}
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)
......
sound/pci/emu10k1/emumixer.c
View file @ 16a8f371
......@@ -91,20 +91,20 @@ static int snd_emu10k1_spdif_put(snd_kcontrol_t * kcontrol,
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 int snd_emu10k1_send_routing_put(snd_kcontrol_t * kcontrol,
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 int snd_emu10k1_send_volume_put(snd_kcontrol_t * kcontrol,
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 int snd_emu10k1_attn_put(snd_kcontrol_t * kcontrol,
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 int snd_emu10k1_shared_spdif_put(snd_kcontrol_t * kcontrol,
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
};
/*
......
sound/pci/emu10k1/emumpu401.c
View file @ 16a8f371
......@@ -287,16 +287,16 @@ static void snd_emu10k1_midi_output_trigger(snd_rawmidi_substream_t * substream,
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)
......
sound/pci/emu10k1/emupcm.c
View file @ 16a8f371
......@@ -141,9 +141,9 @@ static unsigned int capture_period_sizes[31] = {
};
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 unsigned int capture_rates[8] = {
};
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_uframes_t snd_emu10k1_capture_pointer(snd_pcm_substream_t * subst
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_playback =
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 int snd_emu10k1_capture_efx_close(snd_pcm_substream_t * substream)
}
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 @@ int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
}
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 int snd_emu10k1_pcm_efx_voices_mask_put(snd_kcontrol_t * kcontrol, snd_ct
}
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)
......
sound/pci/es1968.c
View file @ 16a8f371
......@@ -1752,26 +1752,26 @@ static int snd_es1968_capture_close(snd_pcm_substream_t * substream)
}
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 @@ static int __devinit snd_es1968_create(snd_card_t * card,
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 int snd_es1968_joystick_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_
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 void __devexit snd_es1968_remove(struct pci_dev *pci)
}
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
};
......
sound/pci/fm801.c
View file @ 16a8f371
......@@ -270,9 +270,9 @@ static unsigned int rates[] = {
#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 @@ static unsigned int channels[] = {
#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 void snd_fm801_interrupt(int irq, void *dev_id, struct pt_regs *regs)
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_playback =
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 int snd_fm801_capture_close(snd_pcm_substream_t * substream)
}
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 @@ static int __devinit snd_fm801_pcm(fm801_t *chip, int device, snd_pcm_t ** rpcm)
*/
#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 @@ static int snd_fm801_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
}
#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_SINGLE("I2S Playback Switch", FM801_I2S_VOL, 15, 1, 1),
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 @@ static int __devinit snd_fm801_create(snd_card_t * card,
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 void __devexit snd_card_fm801_remove(struct pci_dev *pci)
}
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)
......
sound/pci/ice1712.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/intel8x0.c
View file @ 16a8f371
......@@ -617,43 +617,43 @@ static snd_pcm_uframes_t snd_intel8x0_capture_pointer(snd_pcm_substream_t * subs
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 @@ static unsigned int channels4[] = {
#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 @@ static unsigned int channels6[] = {
#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 int snd_intel8x0_capture_close(snd_pcm_substream_t * substream)
}
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_uframes_t snd_intel8x0_capture_mic_pointer(snd_pcm_substream_t *
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 int snd_intel8x0_capture_mic_close(snd_pcm_substream_t * substream)
}
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 @@ static int __devinit snd_intel8x0_create(snd_card_t * card,
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 void __devexit snd_intel8x0_remove(struct pci_dev *pci)
}
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_device_id snd_intel8x0_joystick_ids[] __devinitdata = {
};
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
......
sound/pci/korg1212/korg1212.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/maestro3.c
View file @ 16a8f371
......@@ -1736,25 +1736,25 @@ snd_m3_capture_close(snd_pcm_substream_t *subs)
*/
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 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci,
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 void __devexit snd_m3_remove(struct pci_dev *pci)
}
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
};
......
sound/pci/nm256/nm256.c
View file @ 16a8f371
......@@ -410,9 +410,9 @@ static int samplerates[8] = {
};
#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 @@ snd_nm256_capture_close(snd_pcm_substream_t *substream)
* 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 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
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 void __devexit snd_nm256_remove(struct pci_dev *pci)
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
};
......
sound/pci/rme32.c
View file @ 16a8f371
......@@ -284,7 +284,7 @@ static int snd_rme32_capture_copy(snd_pcm_substream_t * substream, int channel,
* 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 @@ static snd_pcm_hardware_t snd_rme32_playback_spdif_info = {
* 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_capture_spdif_info = {
*/
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_playback_adat_info =
*/
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 @@ static unsigned int period_bytes[] = { RME32_BLOCK_SIZE };
#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 @@ snd_rme32_capture_pointer(snd_pcm_substream_t * substream)
}
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 int snd_rme32_control_spdif_mask_get(snd_kcontrol_t * kcontrol,
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 void __devexit snd_rme32_remove(struct pci_dev *pci)
}
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)
......
sound/pci/rme96.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/rme9652/hdsp.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/rme9652/rme9652.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/sonicvibes.c
View file @ 16a8f371
......@@ -759,40 +759,40 @@ static snd_pcm_uframes_t snd_sonicvibes_capture_pointer(snd_pcm_substream_t * su
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 int snd_sonicvibes_capture_close(snd_pcm_substream_t * substream)
}
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 @@ static int __devinit snd_sonicvibes_pcm(sonicvibes_t * sonic, int device, snd_pc
*/
#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 @@ static int snd_sonicvibes_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
}
#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 @@ static int snd_sonicvibes_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_val
}
#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 @@ static int __devinit snd_sonicvibes_create(snd_card_t * card,
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 void __devexit snd_sonic_remove(struct pci_dev *pci)
}
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)
......
sound/pci/trident/trident.c
View file @ 16a8f371
......@@ -210,13 +210,13 @@ static void snd_card_trident_resume(struct pci_dev *pci)
#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
};
......
sound/pci/trident/trident_main.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/via686.c
View file @ 16a8f371
......@@ -591,41 +591,41 @@ static snd_pcm_uframes_t snd_via686a_capture_pointer(snd_pcm_substream_t * subst
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 int snd_via686a_capture_close(snd_pcm_substream_t * substream)
}
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 int snd_via686a_joystick_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value
}
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 @@ static int __devinit snd_via686a_create(snd_card_t * card,
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 void __devexit snd_via686a_remove(struct pci_dev *pci)
}
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)
......
sound/pci/via8233.c
View file @ 16a8f371
This diff is collapsed.
sound/pci/ymfpci/ymfpci.c
View file @ 16a8f371
......@@ -279,13 +279,13 @@ static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
}
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
};
......
sound/pci/ymfpci/ymfpci_main.c
View file @ 16a8f371
This diff is collapsed.
sound/ppc/awacs.c
View file @ 16a8f371
......@@ -164,11 +164,11 @@ static int snd_pmac_awacs_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_valu
#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 @@ static int snd_pmac_awacs_put_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_valu
}
#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
......
sound/ppc/burgundy.c
View file @ 16a8f371
......@@ -195,11 +195,10 @@ static int snd_pmac_burgundy_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_v
}
#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 @@ static int snd_pmac_burgundy_put_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_el
}
#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 @@ static int snd_pmac_burgundy_put_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_el
}
#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),
......
sound/ppc/daca.c
View file @ 16a8f371
......@@ -200,19 +200,19 @@ static snd_kcontrol_new_t daca_mixers[] = {
.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
},
};
......
sound/ppc/pmac.c
View file @ 16a8f371
This diff is collapsed.
sound/ppc/tumbler.c
View file @ 16a8f371
This diff is collapsed.
sound/usb/usbaudio.c
View file @ 16a8f371
This diff is collapsed.
sound/usb/usbmidi.c
View file @ 16a8f371
This diff is collapsed.
sound/usb/usbmixer.c
View file @ 16a8f371
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7