Update of /cvsroot/alsa/alsa-kernel/core
In directory usw-pr-cvs1:/tmp/cvs-serv19718/core
Modified Files:
control.c hwdep.c info.c pcm.c pcm_native.c pcm_timer.c
rawmidi.c rtctimer.c sound.c timer.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: control.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/control.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- control.c 12 Aug 2002 08:43:44 -0000 1.13
+++ control.c 13 Aug 2002 16:13:34 -0000 1.14
@@ -766,20 +766,20 @@
static struct file_operations snd_ctl_f_ops =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- read: snd_ctl_read,
- open: snd_ctl_open,
- release: snd_ctl_release,
- poll: snd_ctl_poll,
- ioctl: snd_ctl_ioctl,
- fasync: snd_ctl_fasync,
+ .read = snd_ctl_read,
+ .open = snd_ctl_open,
+ .release = snd_ctl_release,
+ .poll = snd_ctl_poll,
+ .ioctl = snd_ctl_ioctl,
+ .fasync = snd_ctl_fasync,
};
static snd_minor_t snd_ctl_reg =
{
- comment: "ctl",
- f_ops: &snd_ctl_f_ops,
+ .comment = "ctl",
+ .f_ops = &snd_ctl_f_ops,
};
int snd_ctl_register(snd_card_t *card)
Index: hwdep.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hwdep.c 27 Feb 2002 19:24:55 -0000 1.9
+++ hwdep.c 13 Aug 2002 16:13:34 -0000 1.10
@@ -238,22 +238,22 @@
static struct file_operations snd_hwdep_f_ops =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- llseek: snd_hwdep_llseek,
- read: snd_hwdep_read,
- write: snd_hwdep_write,
- open: snd_hwdep_open,
- release: snd_hwdep_release,
- poll: snd_hwdep_poll,
- ioctl: snd_hwdep_ioctl,
- mmap: snd_hwdep_mmap,
+ .llseek = snd_hwdep_llseek,
+ .read = snd_hwdep_read,
+ .write = snd_hwdep_write,
+ .open = snd_hwdep_open,
+ .release = snd_hwdep_release,
+ .poll = snd_hwdep_poll,
+ .ioctl = snd_hwdep_ioctl,
+ .mmap = snd_hwdep_mmap,
};
static snd_minor_t snd_hwdep_reg =
{
- comment: "hardware dependent",
- f_ops: &snd_hwdep_f_ops,
+ .comment = "hardware dependent",
+ .f_ops = &snd_hwdep_f_ops,
};
int snd_hwdep_new(snd_card_t * card, char *id, int device, snd_hwdep_t ** rhwdep)
@@ -261,9 +261,9 @@
snd_hwdep_t *hwdep;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_hwdep_dev_free,
- dev_register: snd_hwdep_dev_register,
- dev_unregister: snd_hwdep_dev_unregister
+ .dev_free = snd_hwdep_dev_free,
+ .dev_register = snd_hwdep_dev_register,
+ .dev_unregister = snd_hwdep_dev_unregister
};
snd_assert(rhwdep != NULL, return -EINVAL);
Index: info.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/info.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- info.c 12 Aug 2002 08:43:44 -0000 1.17
+++ info.c 13 Aug 2002 16:13:34 -0000 1.18
@@ -531,16 +531,16 @@
static struct file_operations snd_info_entry_operations =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- llseek: snd_info_entry_llseek,
- read: snd_info_entry_read,
- write: snd_info_entry_write,
- poll: snd_info_entry_poll,
- ioctl: snd_info_entry_ioctl,
- mmap: snd_info_entry_mmap,
- open: snd_info_entry_open,
- release: snd_info_entry_release,
+ .llseek = snd_info_entry_llseek,
+ .read = snd_info_entry_read,
+ .write = snd_info_entry_write,
+ .poll = snd_info_entry_poll,
+ .ioctl = snd_info_entry_ioctl,
+ .mmap = snd_info_entry_mmap,
+ .open = snd_info_entry_open,
+ .release = snd_info_entry_release,
};
#ifdef LINUX_2_2
@@ -602,10 +602,10 @@
struct inode_operations snd_info_card_link_inode_operations =
{
#ifdef LINUX_2_2
- default_file_ops: &snd_info_card_link_operations,
+ .default_file_ops = &snd_info_card_link_operations,
#endif
- readlink: snd_info_card_readlink,
- follow_link: snd_info_card_followlink,
+ .readlink = snd_info_card_readlink,
+ .follow_link = snd_info_card_followlink,
};
struct proc_dir_entry *snd_create_proc_entry(const char *name, mode_t mode,
Index: pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pcm.c 22 Jul 2002 10:48:00 -0000 1.15
+++ pcm.c 13 Aug 2002 16:13:34 -0000 1.16
@@ -598,9 +598,9 @@
snd_pcm_t *pcm;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_pcm_dev_free,
- dev_register: snd_pcm_dev_register,
- dev_unregister: snd_pcm_dev_unregister
+ .dev_free = snd_pcm_dev_free,
+ .dev_register = snd_pcm_dev_register,
+ .dev_unregister = snd_pcm_dev_unregister
};
snd_assert(rpcm != NULL, return -EINVAL);
Index: pcm_native.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_native.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pcm_native.c 12 Aug 2002 08:43:45 -0000 1.20
+++ pcm_native.c 13 Aug 2002 16:13:34 -0000 1.21
@@ -2523,9 +2523,9 @@
static struct vm_operations_struct snd_pcm_vm_ops_status =
{
- nopage: snd_pcm_mmap_status_nopage,
+ .nopage = snd_pcm_mmap_status_nopage,
#ifndef VM_RESERVED
- swapout: snd_pcm_mmap_swapout,
+ .swapout = snd_pcm_mmap_swapout,
#endif
};
@@ -2577,9 +2577,9 @@
static struct vm_operations_struct snd_pcm_vm_ops_control =
{
- nopage: snd_pcm_mmap_control_nopage,
+ .nopage = snd_pcm_mmap_control_nopage,
#ifndef VM_RESERVED
- swapout: snd_pcm_mmap_swapout,
+ .swapout = snd_pcm_mmap_swapout,
#endif
};
@@ -2662,11 +2662,11 @@
static struct vm_operations_struct snd_pcm_vm_ops_data =
{
- open: snd_pcm_mmap_data_open,
- close: snd_pcm_mmap_data_close,
- nopage: snd_pcm_mmap_data_nopage,
+ .open = snd_pcm_mmap_data_open,
+ .close = snd_pcm_mmap_data_close,
+ .nopage = snd_pcm_mmap_data_nopage,
#ifndef VM_RESERVED
- swapout: snd_pcm_mmap_swapout,
+ .swapout = snd_pcm_mmap_swapout,
#endif
};
@@ -2842,44 +2842,44 @@
static struct file_operations snd_pcm_f_ops_playback = {
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- write: snd_pcm_write,
+ .write = snd_pcm_write,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 44)
- writev: snd_pcm_writev,
+ .writev = snd_pcm_writev,
#endif
- open: snd_pcm_open,
- release: snd_pcm_release,
- poll: snd_pcm_playback_poll,
- ioctl: snd_pcm_playback_ioctl,
- mmap: snd_pcm_mmap,
- fasync: snd_pcm_fasync,
+ .open = snd_pcm_open,
+ .release = snd_pcm_release,
+ .poll = snd_pcm_playback_poll,
+ .ioctl = snd_pcm_playback_ioctl,
+ .mmap = snd_pcm_mmap,
+ .fasync = snd_pcm_fasync,
};
static struct file_operations snd_pcm_f_ops_capture = {
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- read: snd_pcm_read,
+ .read = snd_pcm_read,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 44)
- readv: snd_pcm_readv,
+ .readv = snd_pcm_readv,
#endif
- open: snd_pcm_open,
- release: snd_pcm_release,
- poll: snd_pcm_capture_poll,
- ioctl: snd_pcm_capture_ioctl,
- mmap: snd_pcm_mmap,
- fasync: snd_pcm_fasync,
+ .open = snd_pcm_open,
+ .release = snd_pcm_release,
+ .poll = snd_pcm_capture_poll,
+ .ioctl = snd_pcm_capture_ioctl,
+ .mmap = snd_pcm_mmap,
+ .fasync = snd_pcm_fasync,
};
snd_minor_t snd_pcm_reg[2] =
{
{
- comment: "digital audio playback",
- f_ops: &snd_pcm_f_ops_playback,
+ .comment = "digital audio playback",
+ .f_ops = &snd_pcm_f_ops_playback,
},
{
- comment: "digital audio capture",
- f_ops: &snd_pcm_f_ops_capture,
+ .comment = "digital audio capture",
+ .f_ops = &snd_pcm_f_ops_capture,
}
};
Index: pcm_timer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_timer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pcm_timer.c 12 Aug 2002 08:43:45 -0000 1.5
+++ pcm_timer.c 13 Aug 2002 16:13:34 -0000 1.6
@@ -105,12 +105,12 @@
static struct _snd_timer_hardware snd_pcm_timer =
{
- flags: SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_SLAVE,
- resolution: 0,
- ticks: 1,
- c_resolution: snd_pcm_timer_resolution,
- start: snd_pcm_timer_start,
- stop: snd_pcm_timer_stop,
+ .flags = SNDRV_TIMER_HW_AUTO | SNDRV_TIMER_HW_SLAVE,
+ .resolution = 0,
+ .ticks = 1,
+ .c_resolution = snd_pcm_timer_resolution,
+ .start = snd_pcm_timer_start,
+ .stop = snd_pcm_timer_stop,
};
/*
Index: rawmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/rawmidi.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rawmidi.c 5 Aug 2002 14:24:05 -0000 1.17
+++ rawmidi.c 13 Aug 2002 16:13:34 -0000 1.18
@@ -1280,20 +1280,20 @@
static struct file_operations snd_rawmidi_f_ops =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- read: snd_rawmidi_read,
- write: snd_rawmidi_write,
- open: snd_rawmidi_open,
- release: snd_rawmidi_release,
- poll: snd_rawmidi_poll,
- ioctl: snd_rawmidi_ioctl,
+ .read = snd_rawmidi_read,
+ .write = snd_rawmidi_write,
+ .open = snd_rawmidi_open,
+ .release = snd_rawmidi_release,
+ .poll = snd_rawmidi_poll,
+ .ioctl = snd_rawmidi_ioctl,
};
static snd_minor_t snd_rawmidi_reg =
{
- comment: "raw midi",
- f_ops: &snd_rawmidi_f_ops,
+ .comment = "raw midi",
+ .f_ops = &snd_rawmidi_f_ops,
};
static int snd_rawmidi_alloc_substreams(snd_rawmidi_t *rmidi,
@@ -1326,9 +1326,9 @@
snd_rawmidi_t *rmidi;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_rawmidi_dev_free,
- dev_register: snd_rawmidi_dev_register,
- dev_unregister: snd_rawmidi_dev_unregister
+ .dev_free = snd_rawmidi_dev_free,
+ .dev_register = snd_rawmidi_dev_register,
+ .dev_unregister = snd_rawmidi_dev_unregister
};
snd_assert(rrawmidi != NULL, return -EINVAL);
Index: rtctimer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/rtctimer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rtctimer.c 19 Jul 2002 17:06:12 -0000 1.14
+++ rtctimer.c 13 Aug 2002 16:13:34 -0000 1.15
@@ -56,12 +56,12 @@
* The hardware dependent description for this timer.
*/
static struct _snd_timer_hardware rtc_hw = {
- flags: SNDRV_TIMER_HW_FIRST|SNDRV_TIMER_HW_AUTO,
- ticks: 100000000L, /* FIXME: XXX */
- open: rtctimer_open,
- close: rtctimer_close,
- start: rtctimer_start,
- stop: rtctimer_stop,
+ .flags = SNDRV_TIMER_HW_FIRST|SNDRV_TIMER_HW_AUTO,
+ .ticks = 100000000L, /* FIXME: XXX */
+ .open = rtctimer_open,
+ .close = rtctimer_close,
+ .start = rtctimer_start,
+ .stop = rtctimer_stop,
};
int rtctimer_freq = RTC_FREQ; /* frequency */
Index: sound.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sound.c 6 Aug 2002 07:28:24 -0000 1.20
+++ sound.c 13 Aug 2002 16:13:34 -0000 1.21
@@ -123,7 +123,7 @@
struct file_operations *old_fops;
int err = 0;
- if (dev != SNDRV_MINOR_SEQUENCER) {
+ if (dev != SNDRV_MINOR_SEQUENCER && dev != SNDRV_MINOR_TIMER) {
if (snd_cards[card] == NULL) {
#ifdef CONFIG_KMOD
snd_request_card(card);
@@ -154,9 +154,9 @@
struct file_operations snd_fops =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- open: snd_open
+ .open = snd_open
};
static int snd_kernel_minor(int type, snd_card_t * card, int dev)
Index: timer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/timer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- timer.c 5 Aug 2002 14:24:05 -0000 1.14
+++ timer.c 13 Aug 2002 16:13:34 -0000 1.15
@@ -637,9 +637,9 @@
snd_timer_t *timer;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_timer_dev_free,
- dev_register: snd_timer_dev_register,
- dev_unregister: snd_timer_dev_unregister
+ .dev_free = snd_timer_dev_free,
+ .dev_register = snd_timer_dev_register,
+ .dev_unregister = snd_timer_dev_unregister
};
snd_assert(tid != NULL, return -EINVAL);
@@ -821,11 +821,11 @@
static struct _snd_timer_hardware snd_timer_system =
{
- flags: SNDRV_TIMER_HW_FIRST,
- resolution: 1000000000L / HZ,
- ticks: 10000000L,
- start: snd_timer_s_start,
- stop: snd_timer_s_stop
+ .flags = SNDRV_TIMER_HW_FIRST,
+ .resolution = 1000000000L / HZ,
+ .ticks = 10000000L,
+ .start = snd_timer_s_start,
+ .stop = snd_timer_s_stop
};
static void snd_timer_free_system(snd_timer_t *timer)
@@ -1330,19 +1330,19 @@
static struct file_operations snd_timer_f_ops =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner = THIS_MODULE,
#endif
- read: snd_timer_user_read,
- open: snd_timer_user_open,
- release: snd_timer_user_release,
- poll: snd_timer_user_poll,
- ioctl: snd_timer_user_ioctl,
+ .read = snd_timer_user_read,
+ .open = snd_timer_user_open,
+ .release = snd_timer_user_release,
+ .poll = snd_timer_user_poll,
+ .ioctl = snd_timer_user_ioctl,
};
static snd_minor_t snd_timer_reg =
{
- comment: "timer",
- f_ops: &snd_timer_f_ops,
+ .comment = "timer",
+ .f_ops = &snd_timer_f_ops,
};
/*
-------------------------------------------------------
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
