Update of /cvsroot/alsa/alsa-driver/isa/msnd
In directory usw-pr-cvs1:/tmp/cvs-serv12994
Modified Files:
msnd_midi.c msnd_pinnacle.c msnd_pinnacle_mixer.c
Log Message:
struct initialization in C99 style.
Index: msnd_midi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/isa/msnd/msnd_midi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- msnd_midi.c 8 Jul 2002 10:21:54 -0000 1.1
+++ msnd_midi.c 15 Aug 2002 13:06:44 -0000 1.2
@@ -423,17 +423,17 @@
static snd_rawmidi_ops_t snd_msndmidi_output =
{
- open: snd_msndmidi_output_open,
- close: snd_msndmidi_output_close,
- trigger: snd_msndmidi_output_trigger,
+ .open = snd_msndmidi_output_open,
+ .close = snd_msndmidi_output_close,
+ .trigger = snd_msndmidi_output_trigger,
};
#endif
static snd_rawmidi_ops_t snd_msndmidi_input =
{
- open: snd_msndmidi_input_open,
- close: snd_msndmidi_input_close,
- trigger: snd_msndmidi_input_trigger,
+ .open = snd_msndmidi_input_open,
+ .close = snd_msndmidi_input_close,
+ .trigger = snd_msndmidi_input_trigger,
};
static void snd_msndmidi_free(snd_rawmidi_t *rmidi)
Index: msnd_pinnacle.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/isa/msnd/msnd_pinnacle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- msnd_pinnacle.c 24 Jul 2002 10:44:44 -0000 1.3
+++ msnd_pinnacle.c 15 Aug 2002 13:06:44 -0000 1.4
@@ -808,37 +808,37 @@
static snd_pcm_hardware_t snd_msnd_playback =
{
- info: ( SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID),
- formats: ( SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE),
- rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
- rate_min: 8000,
- rate_max: 48000,
- channels_min: 1,
- channels_max: 2,
- buffer_bytes_max: 0x3000,
- period_bytes_min: 0x40,
- period_bytes_max: 0x1800,
- periods_min: 2,
- periods_max: 3,
- fifo_size: 0,
+ .info = ( SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+SNDRV_PCM_INFO_MMAP_VALID),
+ .formats = ( SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE),
+ .rates = SNDRV_PCM_RATE_KNOT |
+SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 8000,
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
+ .buffer_bytes_max = 0x3000,
+ .period_bytes_min = 0x40,
+ .period_bytes_max = 0x1800,
+ .periods_min = 2,
+ .periods_max = 3,
+ .fifo_size = 0,
};
static snd_pcm_hardware_t snd_msnd_capture =
{
- info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID),
- formats: ( SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE),
- rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
- rate_min: 8000,
- rate_max: 48000,
- channels_min: 1,
- channels_max: 2,
- buffer_bytes_max: 0x3000,
- period_bytes_min: 0x40,
- period_bytes_max: 0x1800,
- periods_min: 2,
- periods_max: 3,
- fifo_size: 0,
+ .formats = ( SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE),
+ .rates = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 8000,
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
+ .buffer_bytes_max = 0x3000,
+ .period_bytes_min = 0x40,
+ .period_bytes_max = 0x1800,
+ .periods_min = 2,
+ .periods_max = 3,
+ .fifo_size = 0,
};
@@ -848,9 +848,9 @@
};
static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
- count: 7,
- list: rates,
- mask: 0,
+ .count = 7,
+ .list = rates,
+ .mask = 0,
};
@@ -1116,14 +1116,14 @@
static snd_pcm_ops_t snd_msnd_playback_ops = {
- open: snd_msnd_playback_open,
- close: snd_msnd_playback_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_msnd_playback_hw_params,
-// hw_free: snd_msnd_playback_hw_free,
- prepare: snd_msnd_playback_prepare,
- trigger: snd_msnd_playback_trigger,
- pointer: snd_msnd_playback_pointer,
+ .open = snd_msnd_playback_open,
+ .close = snd_msnd_playback_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_msnd_playback_hw_params,
+// .hw_free = snd_msnd_playback_hw_free,
+ .prepare = snd_msnd_playback_prepare,
+ .trigger = snd_msnd_playback_trigger,
+ .pointer = snd_msnd_playback_pointer,
};
static int snd_msnd_capture_open(snd_pcm_substream_t * substream)
@@ -1230,14 +1230,14 @@
static snd_pcm_ops_t snd_msnd_capture_ops = {
- open: snd_msnd_capture_open,
- close: snd_msnd_capture_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_msnd_capture_hw_params,
-// hw_free: snd_msnd_capture_hw_free,
- prepare: snd_msnd_capture_prepare,
- trigger: snd_msnd_capture_trigger,
- pointer: snd_msnd_capture_pointer,
+ .open = snd_msnd_capture_open,
+ .close = snd_msnd_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+ .hw_params = snd_msnd_capture_hw_params,
+// .hw_free = snd_msnd_capture_hw_free,
+ .prepare = snd_msnd_capture_prepare,
+ .trigger = snd_msnd_capture_trigger,
+ .pointer = snd_msnd_capture_pointer,
};
@@ -1269,7 +1269,7 @@
int err;
snd_card_t *card;
static snd_device_ops_t ops = {
- dev_free: snd_msnd_dev_free,
+ .dev_free = snd_msnd_dev_free,
};
//snd_printd( "snd_msnd_attach(void)\n");
Index: msnd_pinnacle_mixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/isa/msnd/msnd_pinnacle_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- msnd_pinnacle_mixer.c 8 Jul 2002 10:21:54 -0000 1.1
+++ msnd_pinnacle_mixer.c 15 Aug 2002 13:06:44 -0000 1.2
@@ -267,10 +267,10 @@
#define DUMMY_VOLUME(xname, xindex, addr) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
- info: snd_msndmix_volume_info, \
- get: snd_msndmix_volume_get, put: snd_msndmix_volume_put, \
- private_value: addr }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+ .info = snd_msndmix_volume_info, \
+ .get = snd_msndmix_volume_get, .put = snd_msndmix_volume_put, \
+ .private_value = addr }
#define MSND_CONTROLS (sizeof(snd_msnd_controls)/sizeof(snd_kcontrol_new_t))
@@ -283,11 +283,11 @@
DUMMY_VOLUME( "Mic Volume", 0, MSND_MIXER_MIC),
DUMMY_VOLUME( "Monitor", 0, MSND_MIXER_IMIX),
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Capture Source",
- info: snd_msndmix_info_mux,
- get: snd_msndmix_get_mux,
- put: snd_msndmix_put_mux,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Capture Source",
+ .info = snd_msndmix_info_mux,
+ .get = snd_msndmix_get_mux,
+ .put = snd_msndmix_put_mux,
}
};
-------------------------------------------------------
This sf.net email is sponsored by: OSDN - Tired of that same old
cell phone? Get a new here for FREE!
https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
