Update of /cvsroot/alsa/alsa-kernel/pci
In directory usw-pr-cvs1:/tmp/cvs-serv19718/pci
Modified Files:
als4000.c cmipci.c cs4281.c ens1370.c es1938.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: als4000.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- als4000.c 25 May 2002 10:26:10 -0000 1.15
+++ als4000.c 13 Aug 2002 16:13:39 -0000 1.16
@@ -372,40 +372,40 @@
static snd_pcm_hardware_t snd_als4000_playback =
{
- info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID),
- formats: SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
+ .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE,
/* formats */
- 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: 65536,
- period_bytes_min: 64,
- period_bytes_max: 65536,
- 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 = 65536,
+ .period_bytes_min = 64,
+ .period_bytes_max = 65536,
+ .periods_min = 1,
+ .periods_max = 1024,
+ .fifo_size = 0
};
static snd_pcm_hardware_t snd_als4000_capture =
{
- info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID),
- formats: SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
+ .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE,
/* formats */
- 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: 65536,
- period_bytes_min: 64,
- period_bytes_max: 65536,
- 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 = 65536,
+ .period_bytes_min = 64,
+ .period_bytes_max = 65536,
+ .periods_min = 1,
+ .periods_max = 1024,
+ .fifo_size = 0
};
/*****************************************************************/
@@ -451,25 +451,25 @@
/******************************************************************/
static snd_pcm_ops_t snd_als4000_playback_ops = {
- open: snd_als4000_playback_open,
- close: snd_als4000_playback_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_als4000_hw_params,
- hw_free: snd_als4000_hw_free,
- prepare: snd_als4000_playback_prepare,
- trigger: snd_als4000_playback_trigger,
- pointer: snd_als4000_playback_pointer
+ .open = snd_als4000_playback_open,
+ .close = snd_als4000_playback_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_als4000_hw_params,
+ .hw_free = snd_als4000_hw_free,
+ .prepare = snd_als4000_playback_prepare,
+ .trigger = snd_als4000_playback_trigger,
+ .pointer = snd_als4000_playback_pointer
};
static snd_pcm_ops_t snd_als4000_capture_ops = {
- open: snd_als4000_capture_open,
- close: snd_als4000_capture_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_als4000_hw_params,
- hw_free: snd_als4000_hw_free,
- prepare: snd_als4000_capture_prepare,
- trigger: snd_als4000_capture_trigger,
- pointer: snd_als4000_capture_pointer
+ .open = snd_als4000_capture_open,
+ .close = snd_als4000_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_als4000_hw_params,
+ .hw_free = snd_als4000_hw_free,
+ .prepare = snd_als4000_capture_prepare,
+ .trigger = snd_als4000_capture_trigger,
+ .pointer = snd_als4000_capture_pointer
};
static void snd_als4000_pcm_free(snd_pcm_t *pcm)
@@ -679,10 +679,10 @@
}
static struct pci_driver driver = {
- name: "ALS4000",
- id_table: snd_als4000_ids,
- probe: snd_card_als4k_probe,
- remove: __devexit_p(snd_card_als4k_remove),
+ .name = "ALS4000",
+ .id_table = snd_als4000_ids,
+ .probe = snd_card_als4k_probe,
+ .remove = __devexit_p(snd_card_als4k_remove),
};
static int __init alsa_card_als4k_init(void)
Index: cmipci.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- cmipci.c 26 Jul 2002 13:22:55 -0000 1.30
+++ cmipci.c 13 Aug 2002 16:13:39 -0000 1.31
@@ -531,14 +531,14 @@
static unsigned int hw_channels[] = {1, 2, 4, 5, 6};
static snd_pcm_hw_constraint_list_t hw_constraints_channels_4 = {
- count: 3,
- list: hw_channels,
- mask: 0,
+ .count = 3,
+ .list = hw_channels,
+ .mask = 0,
};
static snd_pcm_hw_constraint_list_t hw_constraints_channels_6 = {
- count: 5,
- list: hw_channels,
- mask: 0,
+ .count = 5,
+ .list = hw_channels,
+ .mask = 0,
};
static int set_dac_channels(cmipci_t *cm, cmipci_pcm_t *rec, int channels)
@@ -943,11 +943,11 @@
static snd_kcontrol_new_t snd_cmipci_spdif_default __devinitdata =
{
- iface: SNDRV_CTL_ELEM_IFACE_PCM,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
- info: snd_cmipci_spdif_default_info,
- get: snd_cmipci_spdif_default_get,
- put: snd_cmipci_spdif_default_put
+ .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+ .info = snd_cmipci_spdif_default_info,
+ .get = snd_cmipci_spdif_default_get,
+ .put = snd_cmipci_spdif_default_put
};
static int snd_cmipci_spdif_mask_info(snd_kcontrol_t *kcontrol,
@@ -970,11 +970,11 @@
static snd_kcontrol_new_t snd_cmipci_spdif_mask __devinitdata =
{
- access: SNDRV_CTL_ELEM_ACCESS_READ,
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
- info: snd_cmipci_spdif_mask_info,
- get: snd_cmipci_spdif_mask_get,
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+ .info = snd_cmipci_spdif_mask_info,
+ .get = snd_cmipci_spdif_mask_get,
};
static int snd_cmipci_spdif_stream_info(snd_kcontrol_t *kcontrol,
@@ -1019,12 +1019,12 @@
static snd_kcontrol_new_t snd_cmipci_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_cmipci_spdif_stream_info,
- get: snd_cmipci_spdif_stream_get,
- put: snd_cmipci_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_cmipci_spdif_stream_info,
+ .get = snd_cmipci_spdif_stream_get,
+ .put = snd_cmipci_spdif_stream_put
};
/*
@@ -1284,100 +1284,100 @@
/* playback on channel A */
static snd_pcm_hardware_t snd_cmipci_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_5512 | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5512,
- 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: 1024,
- fifo_size: 0,
+ .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5512,
+ .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 = 1024,
+ .fifo_size = 0,
};
/* capture on channel B */
static snd_pcm_hardware_t snd_cmipci_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_5512 | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5512,
- 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: 1024,
- fifo_size: 0,
+ .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5512,
+ .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 = 1024,
+ .fifo_size = 0,
};
/* playback on channel B - stereo 16bit only? */
static snd_pcm_hardware_t snd_cmipci_playback2 =
{
- 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_5512 | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5512,
- 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: 2,
- periods_max: 1024,
- fifo_size: 0,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5512,
+ .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 = 2,
+ .periods_max = 1024,
+ .fifo_size = 0,
};
/* spdif playback on channel A */
static snd_pcm_hardware_t snd_cmipci_playback_spdif =
{
- info: (SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER),
- formats: SNDRV_PCM_FMTBIT_S16_LE /*| SNDRV_PCM_FMTBIT_S32_LE*/,
- rates: SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
- rate_min: 44100,
- 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: 2,
- periods_max: 1024,
- fifo_size: 0,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE /*| SNDRV_PCM_FMTBIT_S32_LE*/,
+ .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+ .rate_min = 44100,
+ .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 = 2,
+ .periods_max = 1024,
+ .fifo_size = 0,
};
/* spdif capture on channel B */
static snd_pcm_hardware_t snd_cmipci_capture_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),
- formats: SNDRV_PCM_FMTBIT_S16_LE,
- rates: SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
- rate_min: 44100,
- 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: 2,
- periods_max: 1024,
- fifo_size: 0,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+ .rate_min = 44100,
+ .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 = 2,
+ .periods_max = 1024,
+ .fifo_size = 0,
};
/*
@@ -1556,62 +1556,62 @@
*/
static snd_pcm_ops_t snd_cmipci_playback_ops = {
- open: snd_cmipci_playback_open,
- close: snd_cmipci_playback_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_cmipci_hw_params,
- hw_free: snd_cmipci_playback_hw_free,
- prepare: snd_cmipci_playback_prepare,
- trigger: snd_cmipci_playback_trigger,
- pointer: snd_cmipci_playback_pointer,
+ .open = snd_cmipci_playback_open,
+ .close = snd_cmipci_playback_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_cmipci_hw_params,
+ .hw_free = snd_cmipci_playback_hw_free,
+ .prepare = snd_cmipci_playback_prepare,
+ .trigger = snd_cmipci_playback_trigger,
+ .pointer = snd_cmipci_playback_pointer,
};
static snd_pcm_ops_t snd_cmipci_capture_ops = {
- open: snd_cmipci_capture_open,
- close: snd_cmipci_capture_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_cmipci_hw_params,
- hw_free: snd_cmipci_hw_free,
- prepare: snd_cmipci_capture_prepare,
- trigger: snd_cmipci_capture_trigger,
- pointer: snd_cmipci_capture_pointer,
+ .open = snd_cmipci_capture_open,
+ .close = snd_cmipci_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_cmipci_hw_params,
+ .hw_free = snd_cmipci_hw_free,
+ .prepare = snd_cmipci_capture_prepare,
+ .trigger = snd_cmipci_capture_trigger,
+ .pointer = snd_cmipci_capture_pointer,
};
static snd_pcm_ops_t snd_cmipci_playback2_ops = {
- open: snd_cmipci_playback2_open,
- close: snd_cmipci_playback2_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_cmipci_hw_params,
- hw_free: snd_cmipci_hw_free,
- prepare: snd_cmipci_capture_prepare, /* channel B */
- trigger: snd_cmipci_capture_trigger, /* channel B */
- pointer: snd_cmipci_capture_pointer, /* channel B */
+ .open = snd_cmipci_playback2_open,
+ .close = snd_cmipci_playback2_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_cmipci_hw_params,
+ .hw_free = snd_cmipci_hw_free,
+ .prepare = snd_cmipci_capture_prepare, /* channel B */
+ .trigger = snd_cmipci_capture_trigger, /* channel B */
+ .pointer = snd_cmipci_capture_pointer, /* channel B */
};
static snd_pcm_ops_t snd_cmipci_playback_spdif_ops = {
- open: snd_cmipci_playback_spdif_open,
- close: snd_cmipci_playback_spdif_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_cmipci_hw_params,
- hw_free: snd_cmipci_playback_hw_free,
- prepare: snd_cmipci_playback_spdif_prepare, /* set up rate */
- trigger: snd_cmipci_playback_trigger,
- pointer: snd_cmipci_playback_pointer,
+ .open = snd_cmipci_playback_spdif_open,
+ .close = snd_cmipci_playback_spdif_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_cmipci_hw_params,
+ .hw_free = snd_cmipci_playback_hw_free,
+ .prepare = snd_cmipci_playback_spdif_prepare, /* set up rate */
+ .trigger = snd_cmipci_playback_trigger,
+ .pointer = snd_cmipci_playback_pointer,
#ifdef DO_SOFT_AC3
- copy: snd_cmipci_ac3_copy,
- silence: snd_cmipci_ac3_silence,
+ .copy = snd_cmipci_ac3_copy,
+ .silence = snd_cmipci_ac3_silence,
#endif
};
static snd_pcm_ops_t snd_cmipci_capture_spdif_ops = {
- open: snd_cmipci_capture_spdif_open,
- close: snd_cmipci_capture_spdif_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_cmipci_hw_params,
- hw_free: snd_cmipci_capture_spdif_hw_free,
- prepare: snd_cmipci_capture_spdif_prepare,
- trigger: snd_cmipci_capture_trigger,
- pointer: snd_cmipci_capture_pointer,
+ .open = snd_cmipci_capture_spdif_open,
+ .close = snd_cmipci_capture_spdif_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_cmipci_hw_params,
+ .hw_free = snd_cmipci_capture_spdif_hw_free,
+ .prepare = snd_cmipci_capture_spdif_prepare,
+ .trigger = snd_cmipci_capture_trigger,
+ .pointer = snd_cmipci_capture_pointer,
};
@@ -1730,10 +1730,10 @@
((lreg) | ((rreg) << 8) | (lshift << 16) | (rshift << 19) | (mask << 24) | (invert
<< 22) | (stereo << 23))
#define CMIPCI_DOUBLE(xname, left_reg, right_reg, left_shift, right_shift, mask,
invert, stereo) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, \
- info: snd_cmipci_info_volume, \
- get: snd_cmipci_get_volume, put: snd_cmipci_put_volume, \
- private_value: COMPOSE_SB_REG(left_reg, right_reg, left_shift, right_shift, mask,
invert, stereo), \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+ .info = snd_cmipci_info_volume, \
+ .get = snd_cmipci_get_volume, .put = snd_cmipci_put_volume, \
+ .private_value = COMPOSE_SB_REG(left_reg, right_reg, left_shift, right_shift, mask,
+invert, stereo), \
}
#define CMIPCI_SB_VOL_STEREO(xname,reg,shift,mask) CMIPCI_DOUBLE(xname, reg, reg+1,
shift, shift, mask, 0, 1)
@@ -1830,10 +1830,10 @@
* input route (left,right) -> (left,right)
*/
#define CMIPCI_SB_INPUT_SW(xname, left_shift, right_shift) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, \
- info: snd_cmipci_info_input_sw, \
- get: snd_cmipci_get_input_sw, put: snd_cmipci_put_input_sw, \
- private_value: COMPOSE_SB_REG(SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, left_shift,
right_shift, 1, 0, 1), \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+ .info = snd_cmipci_info_input_sw, \
+ .get = snd_cmipci_get_input_sw, .put = snd_cmipci_put_input_sw, \
+ .private_value = COMPOSE_SB_REG(SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT,
+left_shift, right_shift, 1, 0, 1), \
}
static int snd_cmipci_info_input_sw(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t *
uinfo)
@@ -1894,31 +1894,31 @@
*/
#define CMIPCI_MIXER_SW_STEREO(xname, reg, lshift, rshift, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, \
- info: snd_cmipci_info_native_mixer, \
- get: snd_cmipci_get_native_mixer, put: snd_cmipci_put_native_mixer, \
- private_value: COMPOSE_SB_REG(reg, reg, lshift, rshift, 1, invert, 1), \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+ .info = snd_cmipci_info_native_mixer, \
+ .get = snd_cmipci_get_native_mixer, .put = snd_cmipci_put_native_mixer, \
+ .private_value = COMPOSE_SB_REG(reg, reg, lshift, rshift, 1, invert, 1), \
}
#define CMIPCI_MIXER_SW_MONO(xname, reg, shift, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, \
- info: snd_cmipci_info_native_mixer, \
- get: snd_cmipci_get_native_mixer, put: snd_cmipci_put_native_mixer, \
- private_value: COMPOSE_SB_REG(reg, reg, shift, shift, 1, invert, 0), \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+ .info = snd_cmipci_info_native_mixer, \
+ .get = snd_cmipci_get_native_mixer, .put = snd_cmipci_put_native_mixer, \
+ .private_value = COMPOSE_SB_REG(reg, reg, shift, shift, 1, invert, 0), \
}
#define CMIPCI_MIXER_VOL_STEREO(xname, reg, lshift, rshift, mask) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, \
- info: snd_cmipci_info_native_mixer, \
- get: snd_cmipci_get_native_mixer, put: snd_cmipci_put_native_mixer, \
- private_value: COMPOSE_SB_REG(reg, reg, lshift, rshift, mask, 0, 1), \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+ .info = snd_cmipci_info_native_mixer, \
+ .get = snd_cmipci_get_native_mixer, .put = snd_cmipci_put_native_mixer, \
+ .private_value = COMPOSE_SB_REG(reg, reg, lshift, rshift, mask, 0, 1), \
}
#define CMIPCI_MIXER_VOL_MONO(xname, reg, shift, mask) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, \
- info: snd_cmipci_info_native_mixer, \
- get: snd_cmipci_get_native_mixer, put: snd_cmipci_put_native_mixer, \
- private_value: COMPOSE_SB_REG(reg, reg, shift, shift, mask, 0, 0), \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+ .info = snd_cmipci_info_native_mixer, \
+ .get = snd_cmipci_get_native_mixer, .put = snd_cmipci_put_native_mixer, \
+ .private_value = COMPOSE_SB_REG(reg, reg, shift, shift, mask, 0, 0), \
}
static int snd_cmipci_info_native_mixer(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
*uinfo)
@@ -2013,12 +2013,12 @@
CMIPCI_SB_VOL_STEREO("PCM Playback Volume", SB_DSP4_PCM_DEV, 3, 31),
//CMIPCI_MIXER_SW_MONO("PCM Playback Switch", CM_REG_MIXER1, CM_WSMUTE_SHIFT,
1),
{ /* switch with sensitivity */
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "PCM Playback Switch",
- info: snd_cmipci_info_native_mixer,
- get: snd_cmipci_get_native_mixer_sensitive,
- put: snd_cmipci_put_native_mixer_sensitive,
- private_value: COMPOSE_SB_REG(CM_REG_MIXER1, CM_REG_MIXER1,
CM_WSMUTE_SHIFT, CM_WSMUTE_SHIFT, 1, 1, 0),
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "PCM Playback Switch",
+ .info = snd_cmipci_info_native_mixer,
+ .get = snd_cmipci_get_native_mixer_sensitive,
+ .put = snd_cmipci_put_native_mixer_sensitive,
+ .private_value = COMPOSE_SB_REG(CM_REG_MIXER1, CM_REG_MIXER1,
+CM_WSMUTE_SHIFT, CM_WSMUTE_SHIFT, 1, 1, 0),
},
CMIPCI_MIXER_SW_STEREO("PCM Capture Switch", CM_REG_MIXER1, CM_WAVEINL_SHIFT,
CM_WAVEINR_SHIFT, 0),
CMIPCI_SB_VOL_STEREO("Synth Playback Volume", SB_DSP4_SYNTH_DEV, 3, 31),
@@ -2132,11 +2132,11 @@
#define DEFINE_SWITCH_ARG(sname, xreg, xmask, xmask_on, xis_byte, xac3) \
static snd_cmipci_switch_args_t cmipci_switch_arg_##sname = { \
- reg: xreg, \
- mask: xmask, \
- mask_on: xmask_on, \
- is_byte: xis_byte, \
- ac3_sensitive: xac3, \
+ .reg = xreg, \
+ .mask = xmask, \
+ .mask_on = xmask_on, \
+ .is_byte = xis_byte, \
+ .ac3_sensitive = xac3, \
}
#define DEFINE_BIT_SWITCH_ARG(sname, xreg, xmask, xis_byte, xac3) \
@@ -2172,12 +2172,12 @@
DEFINE_SWITCH_ARG(modem, CM_REG_MISC_CTRL, CM_FLINKON|CM_FLINKOFF, CM_FLINKON, 0, 0);
#define DEFINE_SWITCH(sname, stype, sarg) \
-{ name: sname, \
- iface: stype, \
- info: snd_cmipci_uswitch_info, \
- get: snd_cmipci_uswitch_get, \
- put: snd_cmipci_uswitch_put, \
- private_value: (unsigned long)&cmipci_switch_arg_##sarg,\
+{ .name = sname, \
+ .iface = stype, \
+ .info = snd_cmipci_uswitch_info, \
+ .get = snd_cmipci_uswitch_get, \
+ .put = snd_cmipci_uswitch_put, \
+ .private_value = (unsigned long)&cmipci_switch_arg_##sarg,\
}
#define DEFINE_CARD_SWITCH(sname, sarg) DEFINE_SWITCH(sname,
SNDRV_CTL_ELEM_IFACE_CARD, sarg)
@@ -2232,11 +2232,11 @@
DEFINE_MIXER_SWITCH("IEC958 Out To DAC", spdo2dac),
#endif
// DEFINE_MIXER_SWITCH("IEC958 Output Switch", spdif_enable),
- { name: "IEC958 Output Switch",
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- info: snd_cmipci_uswitch_info,
- get: snd_cmipci_spdout_enable_get,
- put: snd_cmipci_spdout_enable_put,
+ { .name = "IEC958 Output Switch",
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .info = snd_cmipci_uswitch_info,
+ .get = snd_cmipci_spdout_enable_get,
+ .put = snd_cmipci_spdout_enable_put,
},
DEFINE_MIXER_SWITCH("IEC958 In Valid", spdi_valid),
DEFINE_MIXER_SWITCH("IEC958 Copyright", spdif_copyright),
@@ -2743,10 +2743,10 @@
static struct pci_driver driver = {
- name: "C-Media PCI",
- id_table: snd_cmipci_ids,
- probe: snd_cmipci_probe,
- remove: __devexit_p(snd_cmipci_remove),
+ .name = "C-Media PCI",
+ .id_table = snd_cmipci_ids,
+ .probe = snd_cmipci_probe,
+ .remove = __devexit_p(snd_cmipci_remove),
};
static int __init alsa_card_cmipci_init(void)
Index: cs4281.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cs4281.c 9 Aug 2002 11:49:03 -0000 1.24
+++ cs4281.c 13 Aug 2002 16:13:39 -0000 1.25
@@ -890,52 +890,52 @@
static snd_pcm_hardware_t snd_cs4281_playback =
{
- info: (SNDRV_PCM_INFO_MMAP |
+ .info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_SYNC_START),
- formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
+ .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
SNDRV_PCM_FMTBIT_U32_LE | SNDRV_PCM_FMTBIT_S32_LE |
SNDRV_PCM_FMTBIT_U32_BE | SNDRV_PCM_FMTBIT_S32_BE,
- 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: (512*1024),
- period_bytes_min: 64,
- period_bytes_max: (512*1024),
- periods_min: 1,
- periods_max: 2,
- fifo_size: CS4281_FIFO_SIZE,
+ .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 = (512*1024),
+ .period_bytes_min = 64,
+ .period_bytes_max = (512*1024),
+ .periods_min = 1,
+ .periods_max = 2,
+ .fifo_size = CS4281_FIFO_SIZE,
};
static snd_pcm_hardware_t snd_cs4281_capture =
{
- info: (SNDRV_PCM_INFO_MMAP |
+ .info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_SYNC_START),
- formats: SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
+ .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_U16_BE | SNDRV_PCM_FMTBIT_S16_BE |
SNDRV_PCM_FMTBIT_U32_LE | SNDRV_PCM_FMTBIT_S32_LE |
SNDRV_PCM_FMTBIT_U32_BE | SNDRV_PCM_FMTBIT_S32_BE,
- 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: (512*1024),
- period_bytes_min: 64,
- period_bytes_max: (512*1024),
- periods_min: 1,
- periods_max: 2,
- fifo_size: CS4281_FIFO_SIZE,
+ .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 = (512*1024),
+ .period_bytes_min = 64,
+ .period_bytes_max = (512*1024),
+ .periods_min = 1,
+ .periods_max = 2,
+ .fifo_size = CS4281_FIFO_SIZE,
};
static int snd_cs4281_playback_open(snd_pcm_substream_t * substream)
@@ -995,25 +995,25 @@
}
static snd_pcm_ops_t snd_cs4281_playback_ops = {
- open: snd_cs4281_playback_open,
- close: snd_cs4281_playback_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_cs4281_hw_params,
- hw_free: snd_cs4281_hw_free,
- prepare: snd_cs4281_playback_prepare,
- trigger: snd_cs4281_trigger,
- pointer: snd_cs4281_pointer,
+ .open = snd_cs4281_playback_open,
+ .close = snd_cs4281_playback_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_cs4281_hw_params,
+ .hw_free = snd_cs4281_hw_free,
+ .prepare = snd_cs4281_playback_prepare,
+ .trigger = snd_cs4281_trigger,
+ .pointer = snd_cs4281_pointer,
};
static snd_pcm_ops_t snd_cs4281_capture_ops = {
- open: snd_cs4281_capture_open,
- close: snd_cs4281_capture_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_cs4281_hw_params,
- hw_free: snd_cs4281_hw_free,
- prepare: snd_cs4281_capture_prepare,
- trigger: snd_cs4281_trigger,
- pointer: snd_cs4281_pointer,
+ .open = snd_cs4281_capture_open,
+ .close = snd_cs4281_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_cs4281_hw_params,
+ .hw_free = snd_cs4281_hw_free,
+ .prepare = snd_cs4281_capture_prepare,
+ .trigger = snd_cs4281_trigger,
+ .pointer = snd_cs4281_pointer,
};
static void snd_cs4281_pcm_free(snd_pcm_t *pcm)
@@ -1106,22 +1106,22 @@
static snd_kcontrol_new_t snd_cs4281_fm_vol =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Synth Playback Volume",
- info: snd_cs4281_info_volume,
- get: snd_cs4281_get_volume,
- put: snd_cs4281_put_volume,
- private_value: ((BA0_FMLVC << 16) | BA0_FMRVC),
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Synth Playback Volume",
+ .info = snd_cs4281_info_volume,
+ .get = snd_cs4281_get_volume,
+ .put = snd_cs4281_put_volume,
+ .private_value = ((BA0_FMLVC << 16) | BA0_FMRVC),
};
static snd_kcontrol_new_t snd_cs4281_pcm_vol =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "PCM Stream Playback Volume",
- info: snd_cs4281_info_volume,
- get: snd_cs4281_get_volume,
- put: snd_cs4281_put_volume,
- private_value: ((BA0_PPLVC << 16) | BA0_PPRVC),
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "PCM Stream Playback Volume",
+ .info = snd_cs4281_info_volume,
+ .get = snd_cs4281_get_volume,
+ .put = snd_cs4281_put_volume,
+ .private_value = ((BA0_PPLVC << 16) | BA0_PPRVC),
};
static void snd_cs4281_mixer_free_ac97(ac97_t *ac97)
@@ -1232,11 +1232,11 @@
}
static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
- read: snd_cs4281_BA0_read,
+ .read = snd_cs4281_BA0_read,
};
static struct snd_info_entry_ops snd_cs4281_proc_ops_BA1 = {
- read: snd_cs4281_BA1_read,
+ .read = snd_cs4281_BA1_read,
};
static void __devinit snd_cs4281_proc_init(cs4281_t * chip)
@@ -1456,7 +1456,7 @@
unsigned int tmp;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_cs4281_dev_free,
+ .dev_free = snd_cs4281_dev_free,
};
*rchip = NULL;
@@ -1878,16 +1878,16 @@
static snd_rawmidi_ops_t snd_cs4281_midi_output =
{
- open: snd_cs4281_midi_output_open,
- close: snd_cs4281_midi_output_close,
- trigger: snd_cs4281_midi_output_trigger,
+ .open = snd_cs4281_midi_output_open,
+ .close = snd_cs4281_midi_output_close,
+ .trigger = snd_cs4281_midi_output_trigger,
};
static snd_rawmidi_ops_t snd_cs4281_midi_input =
{
- open: snd_cs4281_midi_input_open,
- close: snd_cs4281_midi_input_close,
- trigger: snd_cs4281_midi_input_trigger,
+ .open = snd_cs4281_midi_input_open,
+ .close = snd_cs4281_midi_input_close,
+ .trigger = snd_cs4281_midi_input_trigger,
};
static int __devinit snd_cs4281_midi(cs4281_t * chip, int device, snd_rawmidi_t
**rrawmidi)
@@ -2212,13 +2212,13 @@
#endif /* CONFIG_PM */
static struct pci_driver driver = {
- name: "CS4281",
- id_table: snd_cs4281_ids,
- probe: snd_cs4281_probe,
- remove: __devexit_p(snd_cs4281_remove),
+ .name = "CS4281",
+ .id_table = snd_cs4281_ids,
+ .probe = snd_cs4281_probe,
+ .remove = __devexit_p(snd_cs4281_remove),
#ifdef CONFIG_PM
- suspend: snd_cs4281_suspend,
- resume: snd_cs4281_resume,
+ .suspend = snd_cs4281_suspend,
+ .resume = snd_cs4281_resume,
#endif
};
Index: ens1370.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ens1370.c 26 Jul 2002 13:22:55 -0000 1.19
+++ ens1370.c 13 Aug 2002 16:13:40 -0000 1.20
@@ -414,40 +414,40 @@
static unsigned int snd_es1370_fixed_rates[] =
{5512, 11025, 22050, 44100};
static snd_pcm_hw_constraint_list_t snd_es1370_hw_constraints_rates = {
- count: 4,
- list: snd_es1370_fixed_rates,
- mask: 0,
+ .count = 4,
+ .list = snd_es1370_fixed_rates,
+ .mask = 0,
};
static ratnum_t es1370_clock = {
- num: ES_1370_SRCLOCK,
- den_min: 29,
- den_max: 353,
- den_step: 1,
+ .num = ES_1370_SRCLOCK,
+ .den_min = 29,
+ .den_max = 353,
+ .den_step = 1,
};
static snd_pcm_hw_constraint_ratnums_t snd_es1370_hw_constraints_clock = {
- nrats: 1,
- rats: &es1370_clock,
+ .nrats = 1,
+ .rats = &es1370_clock,
};
#else
static ratden_t es1371_dac_clock = {
- num_min: 3000 * (1 << 15),
- num_max: 48000 * (1 << 15),
- num_step: 3000,
- den: 1 << 15,
+ .num_min = 3000 * (1 << 15),
+ .num_max = 48000 * (1 << 15),
+ .num_step = 3000,
+ .den = 1 << 15,
};
static snd_pcm_hw_constraint_ratdens_t snd_es1371_hw_constraints_dac_clock = {
- nrats: 1,
- rats: &es1371_dac_clock,
+ .nrats = 1,
+ .rats = &es1371_dac_clock,
};
static ratnum_t es1371_adc_clock = {
- num: 48000 << 15,
- den_min: 32768,
- den_max: 393216,
- den_step: 1,
+ .num = 48000 << 15,
+ .den_min = 32768,
+ .den_max = 393216,
+ .den_step = 1,
};
static snd_pcm_hw_constraint_ratnums_t snd_es1371_hw_constraints_adc_clock = {
- nrats: 1,
- rats: &es1371_adc_clock,
+ .nrats = 1,
+ .rats = &es1371_adc_clock,
};
#endif
static const unsigned int snd_ensoniq_sample_shift[] =
@@ -953,12 +953,12 @@
static snd_pcm_hardware_t snd_ensoniq_playback1 =
{
- 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_U8 | SNDRV_PCM_FMTBIT_S16_LE,
- rates:
+ .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+ .rates =
#ifndef CHIP1370
SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
#else
@@ -966,55 +966,55 @@
SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_22050 |
SNDRV_PCM_RATE_44100),
#endif
- 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,
+ .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 snd_pcm_hardware_t snd_ensoniq_playback2 =
{
- 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_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,
};
static snd_pcm_hardware_t snd_ensoniq_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,
- 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,
};
static int snd_ensoniq_playback1_open(snd_pcm_substream_t * substream)
@@ -1114,36 +1114,36 @@
}
static snd_pcm_ops_t snd_ensoniq_playback1_ops = {
- open: snd_ensoniq_playback1_open,
- close: snd_ensoniq_playback1_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_ensoniq_hw_params,
- hw_free: snd_ensoniq_hw_free,
- prepare: snd_ensoniq_playback1_prepare,
- trigger: snd_ensoniq_trigger,
- pointer: snd_ensoniq_playback1_pointer,
+ .open = snd_ensoniq_playback1_open,
+ .close = snd_ensoniq_playback1_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_ensoniq_hw_params,
+ .hw_free = snd_ensoniq_hw_free,
+ .prepare = snd_ensoniq_playback1_prepare,
+ .trigger = snd_ensoniq_trigger,
+ .pointer = snd_ensoniq_playback1_pointer,
};
static snd_pcm_ops_t snd_ensoniq_playback2_ops = {
- open: snd_ensoniq_playback2_open,
- close: snd_ensoniq_playback2_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_ensoniq_hw_params,
- hw_free: snd_ensoniq_hw_free,
- prepare: snd_ensoniq_playback2_prepare,
- trigger: snd_ensoniq_trigger,
- pointer: snd_ensoniq_playback2_pointer,
+ .open = snd_ensoniq_playback2_open,
+ .close = snd_ensoniq_playback2_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_ensoniq_hw_params,
+ .hw_free = snd_ensoniq_hw_free,
+ .prepare = snd_ensoniq_playback2_prepare,
+ .trigger = snd_ensoniq_trigger,
+ .pointer = snd_ensoniq_playback2_pointer,
};
static snd_pcm_ops_t snd_ensoniq_capture_ops = {
- open: snd_ensoniq_capture_open,
- close: snd_ensoniq_capture_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_ensoniq_hw_params,
- hw_free: snd_ensoniq_hw_free,
- prepare: snd_ensoniq_capture_prepare,
- trigger: snd_ensoniq_trigger,
- pointer: snd_ensoniq_capture_pointer,
+ .open = snd_ensoniq_capture_open,
+ .close = snd_ensoniq_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_ensoniq_hw_params,
+ .hw_free = snd_ensoniq_hw_free,
+ .prepare = snd_ensoniq_capture_prepare,
+ .trigger = snd_ensoniq_trigger,
+ .pointer = snd_ensoniq_capture_pointer,
};
static void snd_ensoniq_pcm_free(snd_pcm_t *pcm)
@@ -1236,8 +1236,8 @@
#ifdef CHIP1371
#define ES1371_SPDIF(xname) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_es1371_spdif_info, \
- get: snd_es1371_spdif_get, put: snd_es1371_spdif_put }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_es1371_spdif_info, \
+ .get = snd_es1371_spdif_get, .put = snd_es1371_spdif_put }
static int snd_es1371_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
{
@@ -1294,11 +1294,11 @@
unsigned short did; /* device ID */
unsigned char rev; /* revision */
} es1371_spdif_present[] = {
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_CT5880, rev:
CT5880REV_CT5880_C },
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_CT5880, rev:
CT5880REV_CT5880_D },
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_CT5880, rev:
CT5880REV_CT5880_E },
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_ES1371, rev:
ES1371REV_CT5880_A },
- { vid: PCI_ANY_ID, did: PCI_ANY_ID, rev: 0 }
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev =
+CT5880REV_CT5880_C },
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev =
+CT5880REV_CT5880_D },
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev =
+CT5880REV_CT5880_E },
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_ES1371, .rev =
+ES1371REV_CT5880_A },
+ { .vid = PCI_ANY_ID, .did = PCI_ANY_ID }
};
static int snd_ensoniq_1371_mixer(ensoniq_t * ensoniq)
@@ -1327,9 +1327,9 @@
#endif /* CHIP1371 */
#define ENSONIQ_CONTROL(xname, mask) \
-{ iface: SNDRV_CTL_ELEM_IFACE_CARD, name: xname, info: snd_ensoniq_control_info, \
- get: snd_ensoniq_control_get, put: snd_ensoniq_control_put, \
- private_value: mask }
+{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = xname, .info =
+snd_ensoniq_control_info, \
+ .get = snd_ensoniq_control_get, .put = snd_ensoniq_control_put, \
+ .private_value = mask }
static int snd_ensoniq_control_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
*uinfo)
{
@@ -1420,8 +1420,8 @@
#ifdef CHIP1371
#define ES1371_JOYSTICK_ADDR(xname) \
-{ iface: SNDRV_CTL_ELEM_IFACE_CARD, name: xname, info: snd_es1371_joystick_addr_info,
\
- get: snd_es1371_joystick_addr_get, put: snd_es1371_joystick_addr_put }
+{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = xname, .info =
+snd_es1371_joystick_addr_info, \
+ .get = snd_es1371_joystick_addr_get, .put = snd_es1371_joystick_addr_put }
static int snd_es1371_joystick_addr_info(snd_kcontrol_t *kcontrol,
snd_ctl_elem_info_t *uinfo)
{
@@ -1560,23 +1560,23 @@
unsigned short svid; /* subsystem vendor ID */
unsigned short sdid; /* subsystem device ID */
} es1371_amplifier_hack[] = {
- { svid: 0x107b, sdid: 0x2150 }, /* Gateway Solo 2150 */
- { svid: 0x13bd, sdid: 0x100c }, /* EV1938 on Mebius PC-MJ100V */
- { svid: 0x1102, sdid: 0x5938 }, /* Targa Xtender300 */
- { svid: 0x1102, sdid: 0x8938 }, /* IPC Topnote G notebook */
- { svid: PCI_ANY_ID, sdid: PCI_ANY_ID }
+ { .svid = 0x107b, .sdid = 0x2150 }, /* Gateway Solo 2150 */
+ { .svid = 0x13bd, .sdid = 0x100c }, /* EV1938 on Mebius PC-MJ100V */
+ { .svid = 0x1102, .sdid = 0x5938 }, /* Targa Xtender300 */
+ { .svid = 0x1102, .sdid = 0x8938 }, /* IPC Topnote G notebook */
+ { .svid = PCI_ANY_ID, .sdid = PCI_ANY_ID }
};
static struct {
unsigned short vid; /* vendor ID */
unsigned short did; /* device ID */
unsigned char rev; /* revision */
} es1371_ac97_reset_hack[] = {
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_CT5880, rev:
CT5880REV_CT5880_C },
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_CT5880, rev:
CT5880REV_CT5880_D },
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_CT5880, rev:
CT5880REV_CT5880_E },
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_ES1371, rev:
ES1371REV_CT5880_A },
- { vid: PCI_VENDOR_ID_ENSONIQ, did: PCI_DEVICE_ID_ENSONIQ_ES1371, rev:
ES1371REV_ES1373_8 },
- { vid: PCI_ANY_ID, did: PCI_ANY_ID, rev: 0 }
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev =
+CT5880REV_CT5880_C },
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev =
+CT5880REV_CT5880_D },
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_CT5880, .rev =
+CT5880REV_CT5880_E },
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_ES1371, .rev =
+ES1371REV_CT5880_A },
+ { .vid = PCI_VENDOR_ID_ENSONIQ, .did = PCI_DEVICE_ID_ENSONIQ_ES1371, .rev =
+ES1371REV_ES1373_8 },
+ { .vid = PCI_ANY_ID, .did = PCI_ANY_ID }
};
#endif
@@ -1592,7 +1592,7 @@
#endif
int err;
static snd_device_ops_t ops = {
- dev_free: snd_ensoniq_dev_free,
+ .dev_free = snd_ensoniq_dev_free,
};
*rensoniq = NULL;
@@ -1900,16 +1900,16 @@
static snd_rawmidi_ops_t snd_ensoniq_midi_output =
{
- open: snd_ensoniq_midi_output_open,
- close: snd_ensoniq_midi_output_close,
- trigger: snd_ensoniq_midi_output_trigger,
+ .open = snd_ensoniq_midi_output_open,
+ .close = snd_ensoniq_midi_output_close,
+ .trigger = snd_ensoniq_midi_output_trigger,
};
static snd_rawmidi_ops_t snd_ensoniq_midi_input =
{
- open: snd_ensoniq_midi_input_open,
- close: snd_ensoniq_midi_input_close,
- trigger: snd_ensoniq_midi_input_trigger,
+ .open = snd_ensoniq_midi_input_open,
+ .close = snd_ensoniq_midi_input_close,
+ .trigger = snd_ensoniq_midi_input_trigger,
};
static int __devinit snd_ensoniq_midi(ensoniq_t * ensoniq, int device, snd_rawmidi_t
**rrawmidi)
@@ -2053,10 +2053,10 @@
}
static struct pci_driver driver = {
- name: "Ensoniq AudioPCI",
- id_table: snd_audiopci_ids,
- probe: snd_audiopci_probe,
- remove: __devexit_p(snd_audiopci_remove),
+ .name = "Ensoniq AudioPCI",
+ .id_table = snd_audiopci_ids,
+ .probe = snd_audiopci_probe,
+ .remove = __devexit_p(snd_audiopci_remove),
};
static int __init alsa_card_ens137x_init(void)
Index: es1938.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1938.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- es1938.c 25 May 2002 10:26:10 -0000 1.13
+++ es1938.c 13 Aug 2002 16:13:40 -0000 1.14
@@ -454,22 +454,22 @@
static ratnum_t clocks[2] = {
{
- num: 793800,
- den_min: 1,
- den_max: 128,
- den_step: 1,
+ .num = 793800,
+ .den_min = 1,
+ .den_max = 128,
+ .den_step = 1,
},
{
- num: 768000,
- den_min: 1,
- den_max: 128,
- den_step: 1,
+ .num = 768000,
+ .den_min = 1,
+ .den_max = 128,
+ .den_step = 1,
}
};
static snd_pcm_hw_constraint_ratnums_t hw_constraints_clocks = {
- nrats: 2,
- rats: clocks,
+ .nrats = 2,
+ .rats = clocks,
};
@@ -843,20 +843,20 @@
* ----------------------------------------------------------------------*/
static snd_pcm_hardware_t snd_es1938_capture =
{
- info: (SNDRV_PCM_INFO_INTERLEAVED |
- SNDRV_PCM_INFO_BLOCK_TRANSFER),
- 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: 6000,
- rate_max: 48000,
- channels_min: 1,
- channels_max: 2,
- buffer_bytes_max: 65536,
- period_bytes_min: 64,
- period_bytes_max: 65536,
- periods_min: 1,
- periods_max: 1024,
- fifo_size: 256,
+ .info = (SNDRV_PCM_INFO_INTERLEAVED |
+ SNDRV_PCM_INFO_BLOCK_TRANSFER),
+ .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 = 6000,
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
+ .buffer_bytes_max = 65536,
+ .period_bytes_min = 64,
+ .period_bytes_max = 65536,
+ .periods_min = 1,
+ .periods_max = 1024,
+ .fifo_size = 256,
};
/* -----------------------------------------------------------------------
@@ -864,21 +864,21 @@
* -----------------------------------------------------------------------*/
static snd_pcm_hardware_t snd_es1938_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 |
SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U16_LE,
- rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
- rate_min: 6000,
- rate_max: 48000,
- channels_min: 1,
- channels_max: 2,
- buffer_bytes_max: 65536,
- period_bytes_min: 64,
- period_bytes_max: 65536,
- periods_min: 1,
- periods_max: 1024,
- fifo_size: 256,
+ .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 = 6000,
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
+ .buffer_bytes_max = 65536,
+ .period_bytes_min = 64,
+ .period_bytes_max = 65536,
+ .periods_min = 1,
+ .periods_max = 1024,
+ .fifo_size = 256,
};
static int snd_es1938_capture_open(snd_pcm_substream_t * substream)
@@ -958,22 +958,22 @@
}
static snd_pcm_ops_t snd_es1938_playback_ops = {
- open: snd_es1938_playback_open,
- close: snd_es1938_playback_close,
- ioctl: snd_pcm_lib_ioctl,
- prepare: snd_es1938_playback_prepare,
- trigger: snd_es1938_playback_trigger,
- pointer: snd_es1938_playback_pointer,
+ .open = snd_es1938_playback_open,
+ .close = snd_es1938_playback_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .prepare = snd_es1938_playback_prepare,
+ .trigger = snd_es1938_playback_trigger,
+ .pointer = snd_es1938_playback_pointer,
};
static snd_pcm_ops_t snd_es1938_capture_ops = {
- open: snd_es1938_capture_open,
- close: snd_es1938_capture_close,
- ioctl: snd_pcm_lib_ioctl,
- prepare: snd_es1938_capture_prepare,
- trigger: snd_es1938_capture_trigger,
- pointer: snd_es1938_capture_pointer,
- copy: snd_es1938_capture_copy,
+ .open = snd_es1938_capture_open,
+ .close = snd_es1938_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .prepare = snd_es1938_capture_prepare,
+ .trigger = snd_es1938_capture_trigger,
+ .pointer = snd_es1938_capture_pointer,
+ .copy = snd_es1938_capture_copy,
};
static void snd_es1938_free_pcm(snd_pcm_t *pcm)
@@ -1136,10 +1136,10 @@
}
#define ES1938_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
- info: snd_es1938_info_single, \
- get: snd_es1938_get_single, put: snd_es1938_put_single, \
- private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+ .info = snd_es1938_info_single, \
+ .get = snd_es1938_get_single, .put = snd_es1938_put_single, \
+ .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
static int snd_es1938_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
{
@@ -1186,10 +1186,10 @@
}
#define ES1938_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_es1938_info_double, \
- get: snd_es1938_get_double, put: snd_es1938_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_es1938_info_double, \
+ .get = snd_es1938_get_double, .put = snd_es1938_put_double, \
+ .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right <<
+19) | (mask << 24) | (invert << 22) }
static int snd_es1938_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
{
@@ -1266,18 +1266,18 @@
ES1938_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0),
ES1938_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1),
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Hardware Master Playback Volume",
- access: SNDRV_CTL_ELEM_ACCESS_READ,
- info: snd_es1938_info_hw_volume,
- get: snd_es1938_get_hw_volume,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Hardware Master Playback Volume",
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
+ .info = snd_es1938_info_hw_volume,
+ .get = snd_es1938_get_hw_volume,
},
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Hardware Master Playback Switch",
- access: SNDRV_CTL_ELEM_ACCESS_READ,
- info: snd_es1938_info_hw_switch,
- get: snd_es1938_get_hw_switch,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Hardware Master Playback Switch",
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
+ .info = snd_es1938_info_hw_switch,
+ .get = snd_es1938_get_hw_switch,
},
ES1938_SINGLE("Hardware Volume Split", 0, 0x64, 7, 1, 0),
ES1938_DOUBLE("Line Playback Volume", 0, 0x3e, 0x3e, 4, 0, 15, 0),
@@ -1291,11 +1291,11 @@
ES1938_SINGLE("Record Monitor", 0, 0xa8, 3, 1, 0),
ES1938_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Capture Source",
- info: snd_es1938_info_mux,
- get: snd_es1938_get_mux,
- put: snd_es1938_put_mux,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Capture Source",
+ .info = snd_es1938_info_mux,
+ .get = snd_es1938_get_mux,
+ .put = snd_es1938_put_mux,
},
ES1938_DOUBLE("Mono Input Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),
ES1938_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0),
@@ -1309,11 +1309,11 @@
ES1938_DOUBLE("PCM Playback Volume", 1, 0x14, 0x14, 4, 0, 15, 0),
ES1938_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0),
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "3D Control - Switch",
- info: snd_es1938_info_spatializer_enable,
- get: snd_es1938_get_spatializer_enable,
- put: snd_es1938_put_spatializer_enable,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "3D Control - Switch",
+ .info = snd_es1938_info_spatializer_enable,
+ .get = snd_es1938_get_spatializer_enable,
+ .put = snd_es1938_put_spatializer_enable,
},
ES1938_SINGLE("Mic Boost (+26dB)", 0, 0x7d, 3, 1, 0)
};
@@ -1369,7 +1369,7 @@
es1938_t *chip;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_es1938_dev_free,
+ .dev_free = snd_es1938_dev_free,
};
*rchip = NULL;
@@ -1670,10 +1670,10 @@
}
static struct pci_driver driver = {
- name: "ESS ES1938 (Solo-1)",
- id_table: snd_es1938_ids,
- probe: snd_es1938_probe,
- remove: __devexit_p(snd_es1938_remove),
+ .name = "ESS ES1938 (Solo-1)",
+ .id_table = snd_es1938_ids,
+ .probe = snd_es1938_probe,
+ .remove = __devexit_p(snd_es1938_remove),
};
static int __init alsa_card_es1938_init(void)
-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
