[alsa-cvslog] CVS: alsa-kernel/pci via686.c,1.23,1.24
Update of /cvsroot/alsa/alsa-kernel/pci
In directory usw-pr-cvs1:/tmp/cvs-serv27478
Modified Files:
via686.c
Log Message:
AC97 cold reset only when AC-link is down
Index: via686.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via686.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- via686.c31 Jul 2002 14:21:57 - 1.23
+++ via686.c13 Aug 2002 16:29:18 - 1.24
@@ -864,15 +864,19 @@
pci_write_config_byte(chip->pci, 0x42, 0);
#endif
- /* deassert ACLink reset, force SYNC */
- pci_write_config_byte(chip->pci, 0x41, 0xe0);
- udelay(100);
- pci_write_config_byte(chip->pci, 0x41, 0x00);
- udelay(100);
- /* ACLink on, deassert ACLink reset, VSR, SGD data out */
- /* note - FM data out has trouble with non VRA codecs !! */
- pci_write_config_byte(chip->pci, 0x41, 0xcc);
- udelay(100);
+ /* cold reset only when link is down */
+ pci_read_config_byte(chip->pci, 0x40, &pval);
+ if ((pval & 0x01) == 0) {
+ /* deassert ACLink reset, force SYNC */
+ pci_write_config_byte(chip->pci, 0x41, 0xe0);
+ udelay(100);
+ pci_write_config_byte(chip->pci, 0x41, 0x00);
+ udelay(100);
+ /* ACLink on, deassert ACLink reset, VSR, SGD data out */
+ /* note - FM data out has trouble with non VRA codecs !! */
+ pci_write_config_byte(chip->pci, 0x41, 0xcc);
+ udelay(100);
+ }
/* wait until codec ready */
max_count = ((3 * HZ) / 4) + 1;
---
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
[alsa-cvslog] CVS: alsa-driver/test Makefile,1.6,1.7
Update of /cvsroot/alsa/alsa-driver/test In directory usw-pr-cvs1:/tmp/cvs-serv25717/test Modified Files: Makefile Log Message: C99-like structure initializers - first bunch of changes Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/test/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile5 Jun 2001 07:17:29 - 1.6 +++ Makefile13 Aug 2002 16:25:36 - 1.7 @@ -14,7 +14,7 @@ $(CC) $(CFLAGS) -o ossdelay ossdelay.c mmap_test: mmap_test.c - $(CC) $(CFLAGS) -DVERBOSE -o mmap_test mmap_test.c + $(CC) $(CFLAGS) -DVERBOSE -o mmap_test mmap_test.c -lm clean: rm -f *.o $(TARGETS) *~ --- 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
[alsa-cvslog] CVS: alsa-driver/usb usbaudio.c,1.16,1.17 usbmidi.c,1.5,1.6
Update of /cvsroot/alsa/alsa-driver/usb
In directory usw-pr-cvs1:/tmp/cvs-serv25717/usb
Modified Files:
usbaudio.c usbmidi.c
Log Message:
C99-like structure initializers - first bunch of changes
Index: usbaudio.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/usbaudio.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- usbaudio.c 8 Jul 2002 10:20:09 - 1.16
+++ usbaudio.c 13 Aug 2002 16:25:36 - 1.17
@@ -1025,26 +1025,26 @@
static snd_pcm_hardware_t snd_usb_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),
- buffer_bytes_max: (128*1024),
- period_bytes_min: 64,
- period_bytes_max: (128*1024),
- periods_min:2,
- periods_max:1024,
+ .buffer_bytes_max = (128*1024),
+ .period_bytes_min = 64,
+ .period_bytes_max = (128*1024),
+ .periods_min = 2,
+ .periods_max = 1024,
};
static snd_pcm_hardware_t snd_usb_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),
- buffer_bytes_max: (128*1024),
- period_bytes_min: 64,
- period_bytes_max: (128*1024),
- periods_min:2,
- periods_max:1024,
+ .buffer_bytes_max = (128*1024),
+ .period_bytes_min = 64,
+ .period_bytes_max = (128*1024),
+ .periods_min = 2,
+ .periods_max = 1024,
};
/*
@@ -1133,25 +1133,25 @@
}
static snd_pcm_ops_t snd_usb_playback_ops = {
- open: snd_usb_playback_open,
- close: snd_usb_playback_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_usb_hw_params,
- hw_free:snd_usb_hw_free,
- prepare:snd_usb_pcm_prepare,
- trigger:snd_usb_pcm_trigger,
- pointer:snd_usb_pcm_pointer,
+ .open = snd_usb_playback_open,
+ .close =snd_usb_playback_close,
+ .ioctl =snd_pcm_lib_ioctl,
+ .hw_params =snd_usb_hw_params,
+ .hw_free = snd_usb_hw_free,
+ .prepare = snd_usb_pcm_prepare,
+ .trigger = snd_usb_pcm_trigger,
+ .pointer = snd_usb_pcm_pointer,
};
static snd_pcm_ops_t snd_usb_capture_ops = {
- open: snd_usb_capture_open,
- close: snd_usb_capture_close,
- ioctl: snd_pcm_lib_ioctl,
- hw_params: snd_usb_hw_params,
- hw_free:snd_usb_hw_free,
- prepare:snd_usb_pcm_prepare,
- trigger:snd_usb_pcm_trigger,
- pointer:snd_usb_pcm_pointer,
+ .open = snd_usb_capture_open,
+ .close =snd_usb_capture_close,
+ .ioctl =snd_pcm_lib_ioctl,
+ .hw_params =snd_usb_hw_params,
+ .hw_free = snd_usb_hw_free,
+ .prepare = snd_usb_pcm_prepare,
+ .trigger = snd_usb_pcm_trigger,
+ .pointer = snd_usb_pcm_pointer,
};
@@ -1235,20 +1235,20 @@
static void usb_audio_disconnect(struct usb_device *dev, void *ptr);
static struct usb_device_id usb_audio_ids [] = {
-{ match_flags: (USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS),
- bInterfaceClass: USB_CLASS_AUDIO,
- bInterfaceSubClass: USB_SUBCLASS_AUDIO_CONTROL },
+{ .match_flags = (USB_DEVICE_ID_MATCH_INT_CLASS |
+USB_DEVICE_ID_MATCH_INT_SUBCLASS),
+ .bInterfaceClass = USB_CLASS_AUDIO,
+ .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL },
{ }/* Terminating entry */
};
MODULE_DEVICE_TABLE (usb, usb_audio_ids);
static struct usb_driver usb_audio_driver = {
- name: "snd-usb-audio",
- probe: usb_audio_probe,
- disconnect: usb_audio_disconnect,
- driver_list:LIST_HEAD_INIT(usb_audio_driver.driver_list),
- id_table: usb_audio_ids,
+ .name = "snd-usb-audio",
+ .probe =usb_audio_probe,
+ .disconnect = usb_audio_disconnect,
+ .driver_list = LIST_HEAD_INIT(usb_audio_driver.driver_list),
+ .id_table = usb_audio_ids,
};
Index: usbmidi.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/usbmidi.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- us
[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.34,1.35
Update of /cvsroot/alsa/alsa-kernel/pci
In directory usw-pr-cvs1:/tmp/cvs-serv23546
Modified Files:
intel8x0.c
Log Message:
allow ICH4 to proceed without probing PCR / SCR bits.
Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- intel8x0.c 26 Jul 2002 13:22:55 - 1.34
+++ intel8x0.c 13 Aug 2002 16:21:16 - 1.35
@@ -259,6 +259,7 @@
int multi4: 1,
multi6: 1;
int in_ac97_init: 1;
+ int no_codec_check: 1;
ac97_t *ac97;
ac97_t *ac97sec;
@@ -308,8 +309,10 @@
int time;
/* codec ready ? */
- if ((inl(ICHREG(chip, GLOB_STA)) & (codec ? ICH_SCR : ICH_PCR)) == 0)
- return -EIO;
+ if (! chip->no_codec_check) {
+ if ((inl(ICHREG(chip, GLOB_STA)) & (codec ? ICH_SCR : ICH_PCR)) == 0)
+ return -EIO;
+ }
/* Anyone holding a semaphore for 1 msec should be shot... */
time = 100;
@@ -1005,6 +1008,18 @@
*
*/
+static void do_delay(intel8x0_t *chip)
+{
+#ifdef CONFIG_PM
+ if (chip->in_suspend) {
+ mdelay((1000 + HZ - 1) / HZ);
+ return;
+ }
+#endif
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(1);
+}
+
static int snd_intel8x0_chip_init(intel8x0_t *chip)
{
signed long end_time;
@@ -1025,14 +1040,7 @@
do {
if ((inl(ICHREG(chip, GLOB_CNT)) & ICH_AC97WARM) == 0)
goto __ok;
-#ifdef CONFIG_PM
- if (chip->in_suspend) {
- mdelay(10);
- continue;
- }
-#endif
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
+ do_delay(chip);
} while (end_time - (signed long)jiffies >= 0);
snd_printk("AC'97 warm reset still in progress? [0x%x]\n", inl(ICHREG(chip,
GLOB_CNT)));
return -EIO;
@@ -1042,20 +1050,26 @@
* Once it becomes ready it should remain ready
* as long as we do not disable the ac97 link.
*/
+ end_time = jiffies + HZ / 10;
+ do {
+ if (inl(ICHREG(chip, GLOB_STA)) & ICH_PCR)
+ goto __ok1;
+ do_delay(chip);
+ } while (end_time - (signed long)jiffies >= 0);
+ if (chip->pci->device == PCI_DEVICE_ID_INTEL_ICH4) {
+ /* FIXME: ICH4 may have no PCR and SCR bits... */
+ snd_printd(KERN_INFO "intel8x0: no codec is probed, perhaps PCR and
+SCR bits are deactivated.\n");
+ chip->no_codec_check = 1;
+ goto __ok2;
+ }
+ /* check a bit longer... */
end_time = jiffies + HZ;
do {
if (inl(ICHREG(chip, GLOB_STA)) & ICH_PCR)
goto __ok1;
-#ifdef CONFIG_PM
- if (chip->in_suspend) {
- mdelay(10);
- continue;
- }
-#endif
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
+ do_delay(chip);
} while (end_time - (signed long)jiffies >= 0);
- snd_printk("codec_ready: primary codec is not ready [0x%x]\n",
inl(ICHREG(chip, GLOB_STA)));
+ snd_printk(KERN_ERR "codec_ready: primary codec is not ready [0x%x]\n",
+inl(ICHREG(chip, GLOB_STA)));
return -EIO;
__ok1:
@@ -1064,16 +1078,10 @@
do {
if (inl(ICHREG(chip, GLOB_STA)) & ICH_SCR)
break;
-#ifdef CONFIG_PM
- if (chip->in_suspend) {
- mdelay(10);
- continue;
- }
-#endif
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1);
+ do_delay(chip);
} while (end_time - (signed long)jiffies >= 0);
+ __ok2:
inw(chip->port);/* clear semaphore flag */
/* disable interrupts */
---
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
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.29,1.30
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory usw-pr-cvs1:/tmp/cvs-serv22993
Modified Files:
ac97_codec.c
Log Message:
- added the ids for ITE chips.
- check the validity of registers always in the limited register mode.
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ac97_codec.c13 Aug 2002 16:13:40 - 1.29
+++ ac97_codec.c13 Aug 2002 16:20:38 - 1.30
@@ -70,6 +70,7 @@
{ 0x45838300, 0xff00, "ESS Technology",NULL },
{ 0x48525300, 0xff00, "Intersil", NULL },
{ 0x49434500, 0xff00, "ICEnsemble",NULL },
+{ 0x49544500, 0xff00, "ITE Tech.Inc", NULL },
{ 0x4e534300, 0xff00, "National Semiconductor", NULL },
{ 0x53494c00, 0xff00, "Silicon Laboratory",NULL },
{ 0x54524100, 0xff00, "TriTech", NULL },
@@ -116,6 +117,7 @@
{ 0x48525300, 0xff00, "HMP9701", NULL },
{ 0x49434501, 0x, "ICE1230", NULL },
{ 0x49434511, 0x, "ICE1232", NULL }, // alias VIA VT1611A?
+{ 0x49544520, 0x, "IT2226E", NULL },
{ 0x4e534300, 0x, "LM4540/43/45/46/48",NULL }, // only guess --jk
{ 0x4e534331, 0x, "LM4549",NULL },
{ 0x53494c22, 0x, "Si3036",NULL },
@@ -181,6 +183,9 @@
static int snd_ac97_valid_reg(ac97_t *ac97, unsigned short reg)
{
+ if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed))
+ return 0;
+
/* filter some registers for buggy codecs */
switch (ac97->id) {
case AC97_ID_AK4540:
@@ -242,8 +247,6 @@
static void snd_ac97_write_cache_test(ac97_t *ac97, unsigned short reg, unsigned
short value)
{
- if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed))
- return;
#if 0
if (!snd_ac97_valid_reg(ac97, reg))
return;
@@ -911,7 +914,7 @@
{
unsigned short val, mask = 0x8000;
- if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed))
+ if (! snd_ac97_valid_reg(ac97, reg))
return 0;
switch (reg) {
@@ -1752,10 +1755,7 @@
int reg, val;
for (reg = 0; reg < 0x80; reg += 2) {
- if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed))
- val = 0x;
- else
- val = snd_ac97_read(ac97, reg);
+ val = snd_ac97_read(ac97, reg);
snd_iprintf(buffer, "%i:%02x = %04x\n", subidx, reg, val);
}
}
---
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
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx_lib.c,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory usw-pr-cvs1:/tmp/cvs-serv22777
Modified Files:
cs46xx_lib.c
Log Message:
fixed the compile with the older image.
Index: cs46xx_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cs46xx_lib.c12 Aug 2002 11:40:17 - 1.21
+++ cs46xx_lib.c13 Aug 2002 16:19:27 - 1.22
@@ -1869,6 +1869,7 @@
#endif
};
+#ifdef CONFIG_SND_CS46XX_NEW_DSP
/* Only available on the Hercules Game Theater XP soundcard */
static snd_kcontrol_new_t snd_hercules_controls[] __devinitdata = {
{
@@ -1879,6 +1880,7 @@
put: snd_herc_spdif_select_put,
},
};
+#endif
int __devinit snd_cs46xx_mixer(cs46xx_t *chip)
{
@@ -2930,14 +2932,17 @@
static void hercules_mixer_init (cs46xx_t *chip)
{
+#ifdef CONFIG_SND_CS46XX_NEW_DSP
int idx,err;
snd_card_t *card = chip->card;
+#endif
/* set EGPIO to default */
hercules_init(chip);
snd_printdd ("initializing Hercules mixer\n");
+#ifdef CONFIG_SND_CS46XX_NEW_DSP
for (idx = 0 ; idx < sizeof(snd_hercules_controls) /
sizeof(snd_hercules_controls[0]) ; idx++) {
snd_kcontrol_t *kctl;
@@ -2948,6 +2953,7 @@
break;
}
}
+#endif
}
#if 0
---
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
[alsa-cvslog] CVS: alsa-kernel/include cs46xx.h,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/include In directory usw-pr-cvs1:/tmp/cvs-serv22423 Modified Files: cs46xx.h Log Message: fixed the compile with the older image. Index: cs46xx.h === RCS file: /cvsroot/alsa/alsa-kernel/include/cs46xx.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cs46xx.h12 Aug 2002 11:38:46 - 1.9 +++ cs46xx.h13 Aug 2002 16:19:02 - 1.10 @@ -1802,6 +1802,7 @@ int amplifier; void (*amplifier_ctrl)(cs46xx_t *, int); void (*active_ctrl)(cs46xx_t *, int); + void (*mixer_init)(cs46xx_t *); struct pci_dev *acpi_dev; int acpi_port; snd_kcontrol_t *eapd_switch; /* for amplifier hack */ @@ -1816,7 +1817,6 @@ int current_gpio; #endif #ifdef CONFIG_SND_CS46XX_NEW_DSP - void (*mixer_init)(cs46xx_t *); dsp_spos_instance_t * dsp_spos_instance; #else /* for compatibility */ cs46xx_pcm_t *playback_pcm; --- 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
[alsa-cvslog] CVS: alsa-kernel/isa/gus gus_main.c,1.9,1.10 gus_mem_proc.c,1.6,1.7 gus_mixer.c,1.5,1.6 gus_pcm.c,1.11,1.12 gus_timer.c,1.5,1.6 gus_uart.c,1.6,1.7 interwave.c,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/gus
Modified Files:
gus_main.c gus_mem_proc.c gus_mixer.c gus_pcm.c gus_timer.c
gus_uart.c interwave.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: gus_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gus_main.c 3 Mar 2002 09:10:25 - 1.9
+++ gus_main.c 13 Aug 2002 16:13:38 - 1.10
@@ -93,11 +93,11 @@
}
static snd_kcontrol_new_t snd_gus_joystick_control = {
- iface: SNDRV_CTL_ELEM_IFACE_CARD,
- name: "Joystick Speed",
- info: snd_gus_joystick_info,
- get: snd_gus_joystick_get,
- put: snd_gus_joystick_put
+ .iface = SNDRV_CTL_ELEM_IFACE_CARD,
+ .name = "Joystick Speed",
+ .info = snd_gus_joystick_info,
+ .get = snd_gus_joystick_get,
+ .put = snd_gus_joystick_put
};
static void snd_gus_init_control(snd_gus_card_t *gus)
@@ -163,7 +163,7 @@
snd_gus_card_t *gus;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_gus_dev_free,
+ .dev_free = snd_gus_dev_free,
};
*rgus = NULL;
Index: gus_mem_proc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_mem_proc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gus_mem_proc.c 12 Aug 2002 08:43:46 - 1.6
+++ gus_mem_proc.c 13 Aug 2002 16:13:38 - 1.7
@@ -85,8 +85,8 @@
}
static struct snd_info_entry_ops snd_gf1_mem_proc_ops = {
- read: snd_gf1_mem_proc_dump,
- llseek: snd_gf1_mem_proc_llseek,
+ .read = snd_gf1_mem_proc_dump,
+ .llseek = snd_gf1_mem_proc_llseek,
};
int snd_gf1_mem_proc_init(snd_gus_card_t * gus)
Index: gus_mixer.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_mixer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gus_mixer.c 12 Aug 2002 08:43:46 - 1.5
+++ gus_mixer.c 13 Aug 2002 16:13:38 - 1.6
@@ -33,9 +33,9 @@
*/
#define GF1_SINGLE(xname, xindex, shift, invert) \
-{ 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, \
+{ .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) }
static int snd_gf1_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -83,9 +83,9 @@
}
#define ICS_DOUBLE(xname, xindex, addr) \
-{ 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, \
+{ .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 }
static int snd_ics_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
Index: gus_pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_pcm.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gus_pcm.c 12 Aug 2002 08:43:46 - 1.11
+++ gus_pcm.c 13 Aug 2002 16:13:38 - 1.12
@@ -530,15 +530,15 @@
}
static ratnum_t clock = {
- num: 9878400/16,
- den_min: 2,
- den_max: 257,
- den_step: 1,
+ .num = 9878400/16,
+ .den_min = 2,
+ .den_max = 257,
+ .den_step = 1,
};
static snd_pcm_hw_constraint_ratnums_t hw_constraints_clocks = {
- nrats: 1,
- rats: &clock,
+ .nrats = 1,
+ .rats = &clock,
};
static int snd_gf1_pcm_capture_hw_params(snd_pcm_substream_t * substream,
@@ -619,38 +619,38 @@
static snd_pcm_hardware_t snd_gf1_pcm_playback =
{
- info: SNDRV_PCM_INFO_NONINTERLEAVED,
+ .info = SNDRV_PCM_INFO_NONINTERLEAVED,
formats:(SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE),
- rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5510,
- 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 =
[alsa-cvslog] CVS: alsa-kernel/isa/es1688 es1688_lib.c,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/isa/es1688
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/es1688
Modified Files:
es1688_lib.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: es1688_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688_lib.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- es1688_lib.c3 Mar 2002 09:10:25 - 1.13
+++ es1688_lib.c13 Aug 2002 16:13:37 - 1.14
@@ -286,22 +286,22 @@
static ratnum_t clocks[2] = {
{
- num: 795444,
- den_min: 1,
- den_max: 128,
- den_step: 1,
+ .num = 795444,
+ .den_min = 1,
+ .den_max = 128,
+ .den_step = 1,
},
{
- num: 397722,
- den_min: 1,
- den_max: 128,
- den_step: 1,
+ .num = 397722,
+ .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,
};
static void snd_es1688_set_rate(es1688_t *chip, snd_pcm_substream_t *substream)
@@ -520,38 +520,38 @@
static snd_pcm_hardware_t snd_es1688_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_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: 65536,
- period_bytes_min: 64,
- period_bytes_max: 65536,
- 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 = 65536,
+ .period_bytes_min = 64,
+ .period_bytes_max = 65536,
+ .periods_min = 1,
+ .periods_max = 1024,
+ .fifo_size =0,
};
static snd_pcm_hardware_t snd_es1688_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_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,
+ .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 = 65536,
+ .period_bytes_min = 64,
+ .period_bytes_max = 65536,
+ .periods_min = 1,
+ .periods_max = 1024,
+ .fifo_size =0,
};
/*
@@ -642,7 +642,7 @@
es1688_t **rchip)
{
static snd_device_ops_t ops = {
- dev_free: snd_es1688_dev_free,
+ .dev_free = snd_es1688_dev_free,
};
es1688_t *chip;
@@ -701,25 +701,25 @@
}
static snd_pcm_ops_t snd_es1688_playback_ops = {
- open: snd_es1688_playback_open,
- close: snd_es1688_playback_close,
- ioctl: snd_es1688_ioctl,
- hw_params: snd_es1688_hw_params,
- hw_free:snd_es1688_hw_free,
- prepare:snd_es1688_playback_prepare,
- trigger:snd_es1688_playback_trigger,
- pointer:snd_es1688_playback_pointer,
+ .open = snd_es1688_play
[alsa-cvslog] CVS: alsa-kernel/i2c/l3 uda1341.c,1.2,1.3
Update of /cvsroot/alsa/alsa-kernel/i2c/l3
In directory usw-pr-cvs1:/tmp/cvs-serv19718/i2c/l3
Modified Files:
uda1341.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: uda1341.c
===
RCS file: /cvsroot/alsa/alsa-kernel/i2c/l3/uda1341.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uda1341.c 18 Apr 2002 07:47:59 - 1.2
+++ uda1341.c 13 Aug 2002 16:13:36 - 1.3
@@ -459,8 +459,8 @@
/* {{{ 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, \
+{ .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) \
}
@@ -521,8 +521,8 @@
/* {{{ 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, \
+{ .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) \
}
@@ -583,8 +583,8 @@
/* {{{ 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, \
+{ .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) \
}
@@ -839,17 +839,17 @@
/* {{{ Module and L3 initialization */
static struct l3_ops uda1341_ops = {
- open: uda1341_open,
- command:uda1341_command,
- close: uda1341_close,
+ .open = uda1341_open,
+ .command = uda1341_command,
+ .close =uda1341_close,
};
static struct l3_driver uda1341_driver = {
- name: UDA1341_ALSA_NAME,
- attach_client: uda1341_attach,
- detach_client: uda1341_detach,
- ops:&uda1341_ops,
- owner: THIS_MODULE,
+ .name = UDA1341_ALSA_NAME,
+ .attach_client = uda1341_attach,
+ .detach_client = uda1341_detach,
+ .ops = &uda1341_ops,
+ .owner =THIS_MODULE,
};
static int __init uda1341_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
[alsa-cvslog] CVS: alsa-kernel/isa/ad1816a ad1816a_lib.c,1.13,1.14
Update of /cvsroot/alsa/alsa-kernel/isa/ad1816a
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/ad1816a
Modified Files:
ad1816a_lib.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: ad1816a_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1816a/ad1816a_lib.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ad1816a_lib.c 15 Jul 2002 12:09:12 - 1.13
+++ ad1816a_lib.c 13 Aug 2002 16:13:37 - 1.14
@@ -334,41 +334,41 @@
static snd_pcm_hardware_t snd_ad1816a_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_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S16_BE),
- rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
- rate_min: 4000,
- rate_max: 55200,
- 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 = 55200,
+ .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_ad1816a_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_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S16_BE),
- rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
- rate_min: 4000,
- rate_max: 55200,
- 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 = 55200,
+ .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_ad1816a_timer_close(snd_timer_t *timer)
@@ -425,14 +425,14 @@
}
static struct _snd_timer_hardware snd_ad1816a_timer_table = {
- flags: SNDRV_TIMER_HW_AUTO,
- resolution: 1,
- ticks: 65535,
- open: snd_ad1816a_timer_open,
- close: snd_ad1816a_timer_close,
- c_resolution: snd_ad1816a_timer_resolution,
- start: snd_ad1816a_timer_start,
- stop: snd_ad1816a_timer_stop,
+ .flags =SNDRV_TIMER_HW_AUTO,
+ .resolution = 1,
+ .ticks =65535,
+ .open = snd_ad1816a_timer_open,
+ .close =snd_ad1816a_timer_close,
+ .c_resolution = snd_ad1816a_timer_resolution,
+ .start =snd_ad1816a_timer_start,
+ .stop = snd_ad1816a_timer_stop,
};
@@ -575,7 +575,7 @@
ad1816a_t **rchip)
{
static snd_device_ops_t ops = {
- dev_free: snd_ad1816a_dev_free,
+ .dev_free = snd_ad1816a_dev_free,
};
int error;
ad1816a_t *chip;
@@ -631,25 +631,25 @@
}
static snd_pcm_ops_t snd_ad1816a_playback_ops = {
- open: snd_ad1816a_playback_open,
- close: snd_ad1816a_playback_close,
- ioctl:
[alsa-cvslog] CVS: alsa-kernel/isa dt019x.c,1.2,1.3 es18xx.c,1.17,1.18 opl3sa2.c,1.15,1.16
Update of /cvsroot/alsa/alsa-kernel/isa
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa
Modified Files:
dt019x.c es18xx.c opl3sa2.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: dt019x.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dt019x.c31 Jul 2002 15:28:28 - 1.2
+++ dt019x.c13 Aug 2002 16:13:37 - 1.3
@@ -104,7 +104,7 @@
/* DT197A30 */
{
ISAPNP_CARD_ID('R','W','B',0x1688),
- devs: { ISAPNP_DEVICE_ID('@','@','@',0x0001),
+ .devs = { ISAPNP_DEVICE_ID('@','@','@',0x0001),
ISAPNP_DEVICE_ID('@','X','@',0x0001),
ISAPNP_DEVICE_ID('@','H','@',0x0001) }
},
Index: es18xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- es18xx.c26 Jun 2002 02:02:49 - 1.17
+++ es18xx.c13 Aug 2002 16:13:37 - 1.18
@@ -363,42 +363,42 @@
static ratnum_t new_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 new_hw_constraints_clocks = {
- nrats: 2,
- rats: new_clocks,
+ .nrats = 2,
+ .rats = new_clocks,
};
static ratnum_t old_clocks[2] = {
{
- num: 795444,
- den_min: 1,
- den_max: 128,
- den_step: 1,
+ .num = 795444,
+ .den_min = 1,
+ .den_max = 128,
+ .den_step = 1,
},
{
- num: 397722,
- den_min: 1,
- den_max: 128,
- den_step: 1,
+ .num = 397722,
+ .den_min = 1,
+ .den_max = 128,
+ .den_step = 1,
}
};
static snd_pcm_hw_constraint_ratnums_t old_hw_constraints_clocks = {
- nrats: 2,
- rats: old_clocks,
+ .nrats = 2,
+ .rats = old_clocks,
};
@@ -826,40 +826,40 @@
static snd_pcm_hardware_t snd_es18xx_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_U8 | SNDRV_PCM_FMTBIT_S8 |
+ .formats = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
SNDRV_PCM_FMTBIT_S16_LE | 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: 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_es18xx_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_S8 |
+ .formats = (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S8 |
SNDRV_PCM_FMTBIT_S16_LE | 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: 65536,
- period_bytes_min:
[alsa-cvslog] CVS: alsa-kernel/isa/cs423x cs4231_lib.c,1.18,1.19 cs4236_lib.c,1.5,1.6
Update of /cvsroot/alsa/alsa-kernel/isa/cs423x
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/cs423x
Modified Files:
cs4231_lib.c cs4236_lib.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: cs4231_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231_lib.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cs4231_lib.c26 Jun 2002 02:02:50 - 1.18
+++ cs4231_lib.c13 Aug 2002 16:13:37 - 1.19
@@ -74,9 +74,9 @@
};
static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
- count: 14,
- list: rates,
- mask: 0,
+ .count = 14,
+ .list = rates,
+ .mask = 0,
};
static int snd_cs4231_xrate(snd_pcm_runtime_t *runtime)
@@ -795,14 +795,14 @@
static struct _snd_timer_hardware snd_cs4231_timer_table =
{
- flags: SNDRV_TIMER_HW_AUTO,
- resolution: 9945,
- ticks: 65535,
- open: snd_cs4231_timer_open,
- close: snd_cs4231_timer_close,
- c_resolution: snd_cs4231_timer_resolution,
- start: snd_cs4231_timer_start,
- stop: snd_cs4231_timer_stop,
+ .flags =SNDRV_TIMER_HW_AUTO,
+ .resolution = 9945,
+ .ticks =65535,
+ .open = snd_cs4231_timer_open,
+ .close =snd_cs4231_timer_close,
+ .c_resolution = snd_cs4231_timer_resolution,
+ .start =snd_cs4231_timer_start,
+ .stop = snd_cs4231_timer_stop,
};
/*
@@ -1127,40 +1127,40 @@
static snd_pcm_hardware_t snd_cs4231_playback =
{
- info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_SYNC_START),
- formats:(SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_IMA_ADPCM |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+SNDRV_PCM_FMTBIT_IMA_ADPCM |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S16_BE),
- rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5510,
- 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_KNOT | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5510,
+ .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_cs4231_capture =
{
- info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_SYNC_START),
- formats:(SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_IMA_ADPCM |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+SNDRV_PCM_FMTBIT_IMA_ADPCM |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S16_BE),
- rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5510,
- 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_KNOT | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5510,
+ .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,
};
/*
@@ -1395,8 +1395,8 @@
cs4231_t ** rchip)
{
static snd_device_ops_t ops = {
- dev_free: snd_cs4231_dev_free,
-
[alsa-cvslog] CVS: alsa-kernel/drivers dummy.c,1.10,1.11 mtpav.c,1.12,1.13 serial-u16550.c,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/drivers
In directory usw-pr-cvs1:/tmp/cvs-serv19718/drivers
Modified Files:
dummy.c mtpav.c serial-u16550.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: dummy.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/dummy.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dummy.c 18 Jun 2002 08:13:34 - 1.10
+++ dummy.c 13 Aug 2002 16:13:35 - 1.11
@@ -262,38 +262,38 @@
static snd_pcm_hardware_t snd_card_dummy_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:USE_FORMATS,
- rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5500,
- rate_max: 48000,
- channels_min: USE_CHANNELS_MIN,
- channels_max: USE_CHANNELS_MAX,
- buffer_bytes_max: MAX_BUFFER_SIZE,
- period_bytes_min: 64,
- period_bytes_max: MAX_BUFFER_SIZE,
- periods_min:USE_PERIODS_MIN,
- periods_max:USE_PERIODS_MAX,
- fifo_size: 0,
+ .formats = USE_FORMATS,
+ .rates =SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5500,
+ .rate_max = 48000,
+ .channels_min = USE_CHANNELS_MIN,
+ .channels_max = USE_CHANNELS_MAX,
+ .buffer_bytes_max = MAX_BUFFER_SIZE,
+ .period_bytes_min = 64,
+ .period_bytes_max = MAX_BUFFER_SIZE,
+ .periods_min = USE_PERIODS_MIN,
+ .periods_max = USE_PERIODS_MAX,
+ .fifo_size =0,
};
static snd_pcm_hardware_t snd_card_dummy_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:USE_FORMATS,
- rates: SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5500,
- rate_max: 48000,
- channels_min: USE_CHANNELS_MIN,
- channels_max: USE_CHANNELS_MAX,
- buffer_bytes_max: MAX_BUFFER_SIZE,
- period_bytes_min: 64,
- period_bytes_max: MAX_BUFFER_SIZE,
- periods_min:USE_PERIODS_MIN,
- periods_max:USE_PERIODS_MAX,
- fifo_size: 0,
+ .formats = USE_FORMATS,
+ .rates =SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5500,
+ .rate_max = 48000,
+ .channels_min = USE_CHANNELS_MIN,
+ .channels_max = USE_CHANNELS_MAX,
+ .buffer_bytes_max = MAX_BUFFER_SIZE,
+ .period_bytes_min = 64,
+ .period_bytes_max = MAX_BUFFER_SIZE,
+ .periods_min = USE_PERIODS_MIN,
+ .periods_max = USE_PERIODS_MAX,
+ .fifo_size =0,
};
static void snd_card_dummy_runtime_free(snd_pcm_runtime_t *runtime)
@@ -376,21 +376,21 @@
}
static snd_pcm_ops_t snd_card_dummy_playback_ops = {
- open: snd_card_dummy_playback_open,
- close: snd_card_dummy_playback_close,
- ioctl: snd_card_dummy_playback_ioctl,
- prepare:snd_card_dummy_playback_prepare,
- trigger:snd_card_dummy_playback_trigger,
- pointer:snd_card_dummy_playback_pointer,
+ .open = snd_card_dummy_playback_open,
+ .close =snd_card_dummy_playback_close,
+ .ioctl =snd_card_dummy_playback_ioctl,
+ .prepare = snd_card_dummy_playback_prepare,
+ .trigger = snd_card_dummy_playback_trigger,
+ .pointer = snd_card_dummy_playback_pointer,
};
static snd_pcm_ops_t snd_card_dummy_capture_ops = {
- open: snd_card_dummy_capture_open,
- close: snd_card_dummy_capture_close,
- ioctl: snd_card_dummy_capture_ioctl,
- prepare:snd_card_dummy_capture_prepare,
- trigger:snd_card_dummy_capture_trigger,
- pointer:snd_card_dummy_capture_pointer,
+ .open = snd_card_dummy_capture_open,
+ .close =snd_card_dummy_capture_close,
+ .ioctl =snd_card_dummy_capt
[alsa-cvslog] CVS: alsa-kernel/isa/ad1848 ad1848_lib.c,1.18,1.19
Update of /cvsroot/alsa/alsa-kernel/isa/ad1848
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/ad1848
Modified Files:
ad1848_lib.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: ad1848_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1848/ad1848_lib.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ad1848_lib.c26 Jun 2002 02:02:49 - 1.18
+++ ad1848_lib.c13 Aug 2002 16:13:37 - 1.19
@@ -68,9 +68,9 @@
};
static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
- count: 14,
- list: rates,
- mask: 0,
+ .count = 14,
+ .list = rates,
+ .mask = 0,
};
static unsigned char snd_ad1848_original_image[16] =
@@ -701,40 +701,40 @@
static snd_pcm_hardware_t snd_ad1848_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_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE),
- rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5510,
- 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_KNOT | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5510,
+ .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_ad1848_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_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE),
- rates: SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
- rate_min: 5510,
- 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_KNOT | SNDRV_PCM_RATE_8000_48000,
+ .rate_min = 5510,
+ .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,
};
/*
@@ -833,7 +833,7 @@
ad1848_t ** rchip)
{
static snd_device_ops_t ops = {
- dev_free: snd_ad1848_dev_free,
+ .dev_free = snd_ad1848_dev_free,
};
ad1848_t *chip;
int err;
@@ -882,25 +882,25 @@
}
static snd_pcm_ops_t snd_ad1848_playback_ops = {
- open: snd_ad1848_playback_open,
- close: snd_ad1848_playback_close,
- ioctl: snd_ad1848_ioctl,
- hw_params: snd_ad1848_playback_hw_params,
- hw_free:snd_ad1848_playback_hw_free,
- prepare:snd_ad1848_playback_prepare,
- trigger:snd_ad1848_playback_trigger,
- pointer:snd_ad1848_playback_pointer,
+ .open = snd_ad1848_playback_open,
+ .close =snd_ad1848_playback_close,
+ .ioctl =snd_ad1848_ioctl,
+ .hw_params =snd_ad1848_playback_hw_params,
+ .hw_free = snd_ad1848_playback_hw_free,
+ .prepare = snd_ad1848_playback_prepare,
+ .trigger = snd_ad1848_playback_trigger,
+ .pointer = snd_ad1848_playback_pointer,
};
static snd_pcm_ops_t snd_ad1848_capture_ops = {
[alsa-cvslog] CVS: alsa-kernel/include ad1848.h,1.4,1.5 cs4231.h,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/include
In directory usw-pr-cvs1:/tmp/cvs-serv19718/include
Modified Files:
ad1848.h cs4231.h
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: ad1848.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ad1848.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ad1848.h29 Jan 2002 07:41:48 - 1.4
+++ ad1848.h13 Aug 2002 16:13:36 - 1.5
@@ -166,20 +166,20 @@
void snd_ad1848_interrupt(int irq, void *dev_id, struct pt_regs *regs);
#define AD1848_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
- info: snd_ad1848_info_single, \
- get: snd_ad1848_get_single, put: snd_ad1848_put_single, \
- private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+ .info = snd_ad1848_info_single, \
+ .get = snd_ad1848_get_single, .put = snd_ad1848_put_single, \
+ .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
int snd_ad1848_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);
int snd_ad1848_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
int snd_ad1848_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
#define AD1848_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_ad1848_info_double, \
- get: snd_ad1848_get_double, put: snd_ad1848_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_ad1848_info_double, \
+ .get = snd_ad1848_get_double, .put = snd_ad1848_put_double, \
+ .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right <<
+19) | (mask << 24) | (invert << 22) }
int snd_ad1848_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);
int snd_ad1848_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
Index: cs4231.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/cs4231.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cs4231.h4 Jan 2002 15:08:43 - 1.3
+++ cs4231.h13 Aug 2002 16:13:37 - 1.4
@@ -298,20 +298,20 @@
*/
#define CS4231_SINGLE(xname, xindex, reg, shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, index: xindex, \
- info: snd_cs4231_info_single, \
- get: snd_cs4231_get_single, put: snd_cs4231_put_single, \
- private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+ .info = snd_cs4231_info_single, \
+ .get = snd_cs4231_get_single, .put = snd_cs4231_put_single, \
+ .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
int snd_cs4231_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);
int snd_cs4231_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
int snd_cs4231_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
#define CS4231_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_cs4231_info_double, \
- get: snd_cs4231_get_double, put: snd_cs4231_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_cs4231_info_double, \
+ .get = snd_cs4231_get_double, .put = snd_cs4231_put_double, \
+ .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right <<
+19) | (mask << 24) | (invert << 22) }
int snd_cs4231_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo);
int snd_cs4231_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol);
---
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
[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_oss.c,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory usw-pr-cvs1:/tmp/cvs-serv19718/core/oss
Modified Files:
pcm_oss.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: pcm_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pcm_oss.c 26 Jun 2002 02:02:49 - 1.17
+++ pcm_oss.c 13 Aug 2002 16:13:34 - 1.18
@@ -2083,21 +2083,21 @@
static struct file_operations snd_pcm_oss_f_reg =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner =THIS_MODULE,
#endif
- read: snd_pcm_oss_read,
- write: snd_pcm_oss_write,
- open: snd_pcm_oss_open,
- release:snd_pcm_oss_release,
- poll: snd_pcm_oss_poll,
- ioctl: snd_pcm_oss_ioctl,
- mmap: snd_pcm_oss_mmap,
+ .read = snd_pcm_oss_read,
+ .write =snd_pcm_oss_write,
+ .open = snd_pcm_oss_open,
+ .release = snd_pcm_oss_release,
+ .poll = snd_pcm_oss_poll,
+ .ioctl =snd_pcm_oss_ioctl,
+ .mmap = snd_pcm_oss_mmap,
};
static snd_minor_t snd_pcm_oss_reg =
{
- comment:"digital audio",
- f_ops: &snd_pcm_oss_f_reg,
+ .comment = "digital audio",
+ .f_ops =&snd_pcm_oss_f_reg,
};
static void register_oss_dsp(unsigned short native_minor, snd_pcm_t *pcm, int index)
@@ -2159,8 +2159,8 @@
static snd_pcm_notify_t snd_pcm_oss_notify =
{
- n_register: snd_pcm_oss_register_minor,
- n_unregister: snd_pcm_oss_unregister_minor,
+ .n_register = snd_pcm_oss_register_minor,
+ .n_unregister = snd_pcm_oss_unregister_minor,
};
static int __init alsa_pcm_oss_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
[alsa-cvslog] CVS: alsa-kernel/i2c cs8427.c,1.6,1.7 i2c.c,1.5,1.6 tea6330t.c,1.5,1.6
Update of /cvsroot/alsa/alsa-kernel/i2c
In directory usw-pr-cvs1:/tmp/cvs-serv19718/i2c
Modified Files:
cs8427.c i2c.c tea6330t.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: cs8427.c
===
RCS file: /cvsroot/alsa/alsa-kernel/i2c/cs8427.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cs8427.c2 Apr 2002 07:49:57 - 1.6
+++ cs8427.c13 Aug 2002 16:13:36 - 1.7
@@ -82,7 +82,7 @@
buf[1] = val;
if ((err = snd_i2c_sendbytes(device, buf, 2)) != 2) {
snd_printk("unable to send bytes 0x%02x:0x%02x to CS8427 (%i)\n",
buf[0], buf[1], err);
- return err < 0 ? err : -EREMOTE;
+ return err < 0 ? err : -EIO;
}
return 0;
}
@@ -94,11 +94,11 @@
if ((err = snd_i2c_sendbytes(device, ®, 1)) != 1) {
snd_printk("unable to send register 0x%x byte to CS8427\n", reg);
- return err < 0 ? err : -EREMOTE;
+ return err < 0 ? err : -EIO;
}
if ((err = snd_i2c_readbytes(device, &buf, 1)) != 1) {
snd_printk("unable to read register 0x%x byte from CS8427\n", reg);
- return err < 0 ? err : -EREMOTE;
+ return err < 0 ? err : -EIO;
}
return buf;
}
@@ -148,7 +148,7 @@
for (idx = 0; idx < count; idx++)
data[idx + 1] = swapbits(ndata[idx]);
if (snd_i2c_sendbytes(device, data, count) != count)
- return -EREMOTE;
+ return -EIO;
return 1;
}
@@ -226,7 +226,7 @@
/* send initial values */
memcpy(chip->regmap + (initvals1[0] & 0x7f), initvals1 + 1, 6);
if ((err = snd_i2c_sendbytes(device, initvals1, 7)) != 7) {
- err = err < 0 ? err : -EREMOTE;
+ err = err < 0 ? err : -EIO;
goto __fail;
}
/* Turn off CS8427 interrupt stuff that is not used in hardware */
@@ -238,7 +238,7 @@
/* send transfer initialization sequence */
memcpy(chip->regmap + (initvals2[0] & 0x7f), initvals2 + 1, 3);
if ((err = snd_i2c_sendbytes(device, initvals2, 4)) != 4) {
- err = err < 0 ? err : -EREMOTE;
+ err = err < 0 ? err : -EIO;
goto __fail;
}
/* write default channel status bytes */
@@ -274,7 +274,7 @@
__fail:
snd_i2c_unlock(bus);
snd_i2c_device_free(device);
- return err < 0 ? err : -EREMOTE;
+ return err < 0 ? err : -EIO;
}
static int snd_cs8427_in_status_info(snd_kcontrol_t *kcontrol,
@@ -359,35 +359,35 @@
static snd_kcontrol_new_t snd_cs8427_iec958_controls[] = {
{
- iface: SNDRV_CTL_ELEM_IFACE_PCM,
- info: snd_cs8427_in_status_info,
- name: "IEC958 CS8427 Input Status",
- access: SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
- get: snd_cs8427_in_status_get,
+ .iface =SNDRV_CTL_ELEM_IFACE_PCM,
+ .info = snd_cs8427_in_status_info,
+ .name = "IEC958 CS8427 Input Status",
+ .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+ .get = snd_cs8427_in_status_get,
},
{
- access: SNDRV_CTL_ELEM_ACCESS_READ,
- iface: SNDRV_CTL_ELEM_IFACE_PCM,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
- info: snd_cs8427_spdif_mask_info,
- get:snd_cs8427_spdif_mask_get,
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
+ .iface =SNDRV_CTL_ELEM_IFACE_PCM,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
+ .info = snd_cs8427_spdif_mask_info,
+ .get = snd_cs8427_spdif_mask_get,
},
{
- iface: SNDRV_CTL_ELEM_IFACE_PCM,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
- info: snd_cs8427_spdif_info,
- get:snd_cs8427_spdif_get,
- put:snd_cs8427_spdif_put,
- private_value: 0
+ .iface =SNDRV_CTL_ELEM_IFACE_PCM,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+ .info = snd_cs8427_spdif_info,
+ .get = snd_cs8427_spdif_get,
+ .put = snd_cs8427_spdif_put,
+ .private_value = 0
},
{
- 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_cs8427_spdif_info,
- get:snd_cs8427_spdif_get,
- put:snd_cs8427_spdif_put,
- private_value: 1
+ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
+SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+ .iface =SNDRV_CTL_ELEM_IFACE_PCM,
+ .name =
[alsa-cvslog] CVS: alsa-kernel/core control.c,1.13,1.14 hwdep.c,1.9,1.10 info.c,1.17,1.18 pcm.c,1.15,1.16 pcm_native.c,1.20,1.21 pcm_timer.c,1.5,1.6 rawmidi.c,1.17,1.18 rtctimer.c,1.14,1.15 sound.c,1.20,1.21 timer.c,1.14,1.15
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 - 1.13
+++ control.c 13 Aug 2002 16:13:34 - 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 - 1.9
+++ hwdep.c 13 Aug 2002 16:13:34 - 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 - 1.17
+++ info.c 13 Aug 2002 16:13:34 - 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,
[alsa-cvslog] CVS: alsa-kernel/drivers/opl3 opl3_lib.c,1.11,1.12 opl3_oss.c,1.6,1.7 opl3_seq.c,1.6,1.7
Update of /cvsroot/alsa/alsa-kernel/drivers/opl3
In directory usw-pr-cvs1:/tmp/cvs-serv19718/drivers/opl3
Modified Files:
opl3_lib.c opl3_oss.c opl3_seq.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: opl3_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl3/opl3_lib.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opl3_lib.c 7 Aug 2002 13:14:50 - 1.11
+++ opl3_lib.c 13 Aug 2002 16:13:35 - 1.12
@@ -259,20 +259,20 @@
static struct _snd_timer_hardware snd_opl3_timer1 =
{
- flags: SNDRV_TIMER_HW_STOP,
- resolution: 8,
- ticks: 256,
- start: snd_opl3_timer1_start,
- stop: snd_opl3_timer1_stop,
+ .flags =SNDRV_TIMER_HW_STOP,
+ .resolution = 8,
+ .ticks =256,
+ .start =snd_opl3_timer1_start,
+ .stop = snd_opl3_timer1_stop,
};
static struct _snd_timer_hardware snd_opl3_timer2 =
{
- flags: SNDRV_TIMER_HW_STOP,
- resolution: 32,
- ticks: 256,
- start: snd_opl3_timer2_start,
- stop: snd_opl3_timer2_stop,
+ .flags =SNDRV_TIMER_HW_STOP,
+ .resolution = 32,
+ .ticks =256,
+ .start =snd_opl3_timer2_start,
+ .stop = snd_opl3_timer2_stop,
};
static int snd_opl3_timer1_init(opl3_t * opl3, int timer_no)
@@ -380,7 +380,7 @@
opl3_t *opl3;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_opl3_dev_free,
+ .dev_free = snd_opl3_dev_free,
};
*ropl3 = NULL;
Index: opl3_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl3/opl3_oss.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opl3_oss.c 12 Aug 2002 08:43:46 - 1.6
+++ opl3_oss.c 13 Aug 2002 16:13:36 - 1.7
@@ -46,12 +46,12 @@
extern snd_midi_op_t opl3_ops;
static snd_seq_oss_callback_t oss_callback = {
- owner: THIS_MODULE,
- open: snd_opl3_open_seq_oss,
- close: snd_opl3_close_seq_oss,
- ioctl: snd_opl3_ioctl_seq_oss,
- load_patch: snd_opl3_load_patch_seq_oss,
- reset: snd_opl3_reset_seq_oss,
+ .owner =THIS_MODULE,
+ .open = snd_opl3_open_seq_oss,
+ .close =snd_opl3_close_seq_oss,
+ .ioctl =snd_opl3_ioctl_seq_oss,
+ .load_patch = snd_opl3_load_patch_seq_oss,
+ .reset =snd_opl3_reset_seq_oss,
};
static int snd_opl3_oss_event_input(snd_seq_event_t *ev, int direct,
Index: opl3_seq.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl3/opl3_seq.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opl3_seq.c 25 May 2002 10:26:07 - 1.6
+++ opl3_seq.c 13 Aug 2002 16:13:36 - 1.7
@@ -146,13 +146,13 @@
* MIDI emulation operators
*/
snd_midi_op_t opl3_ops = {
- snd_opl3_note_on,
- snd_opl3_note_off,
- snd_opl3_key_press,
- snd_opl3_terminate_note,
- snd_opl3_control,
- snd_opl3_nrpn,
- snd_opl3_sysex,
+ .note_on = snd_opl3_note_on,
+ .note_off = snd_opl3_note_off,
+ .key_press =snd_opl3_key_press,
+ .note_terminate = snd_opl3_terminate_note,
+ .control = snd_opl3_control,
+ .nrpn = snd_opl3_nrpn,
+ .sysex =snd_opl3_sysex,
};
static int snd_opl3_synth_event_input(snd_seq_event_t * ev, int direct,
---
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
[alsa-cvslog] CVS: alsa-kernel/core/seq seq_clientmgr.c,1.14,1.15 seq_device.c,1.7,1.8 seq_virmidi.c,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/core/seq
In directory usw-pr-cvs1:/tmp/cvs-serv19718/core/seq
Modified Files:
seq_clientmgr.c seq_device.c seq_virmidi.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: seq_clientmgr.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_clientmgr.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- seq_clientmgr.c 12 Aug 2002 08:43:45 - 1.14
+++ seq_clientmgr.c 13 Aug 2002 16:13:34 - 1.15
@@ -2466,20 +2466,20 @@
static struct file_operations snd_seq_f_ops =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner =THIS_MODULE,
#endif
- read: snd_seq_read,
- write: snd_seq_write,
- open: snd_seq_open,
- release:snd_seq_release,
- poll: snd_seq_poll,
- ioctl: snd_seq_ioctl,
+ .read = snd_seq_read,
+ .write =snd_seq_write,
+ .open = snd_seq_open,
+ .release = snd_seq_release,
+ .poll = snd_seq_poll,
+ .ioctl =snd_seq_ioctl,
};
static snd_minor_t snd_seq_reg =
{
- comment:"sequencer",
- f_ops: &snd_seq_f_ops,
+ .comment = "sequencer",
+ .f_ops =&snd_seq_f_ops,
};
Index: seq_device.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_device.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- seq_device.c18 Mar 2002 14:27:50 - 1.7
+++ seq_device.c13 Aug 2002 16:13:35 - 1.8
@@ -164,9 +164,9 @@
ops_list_t *ops;
int err;
static snd_device_ops_t dops = {
- dev_free: snd_seq_device_dev_free,
- dev_register: snd_seq_device_dev_register,
- dev_unregister: snd_seq_device_dev_unregister
+ .dev_free = snd_seq_device_dev_free,
+ .dev_register = snd_seq_device_dev_register,
+ .dev_unregister = snd_seq_device_dev_unregister
};
if (result)
Index: seq_virmidi.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_virmidi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- seq_virmidi.c 4 Jul 2002 09:45:57 - 1.9
+++ seq_virmidi.c 13 Aug 2002 16:13:35 - 1.10
@@ -341,15 +341,15 @@
*/
static snd_rawmidi_ops_t snd_virmidi_input_ops = {
- open: snd_virmidi_input_open,
- close: snd_virmidi_input_close,
- trigger: snd_virmidi_input_trigger,
+ .open = snd_virmidi_input_open,
+ .close = snd_virmidi_input_close,
+ .trigger = snd_virmidi_input_trigger,
};
static snd_rawmidi_ops_t snd_virmidi_output_ops = {
- open: snd_virmidi_output_open,
- close: snd_virmidi_output_close,
- trigger: snd_virmidi_output_trigger,
+ .open = snd_virmidi_output_open,
+ .close = snd_virmidi_output_close,
+ .trigger = snd_virmidi_output_trigger,
};
/*
@@ -468,8 +468,8 @@
*
*/
static snd_rawmidi_global_ops_t snd_virmidi_global_ops = {
- dev_register: snd_virmidi_dev_register,
- dev_unregister: snd_virmidi_dev_unregister,
+ .dev_register = snd_virmidi_dev_register,
+ .dev_unregister = snd_virmidi_dev_unregister,
};
/*
---
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
[alsa-cvslog] CVS: alsa-kernel/drivers/mpu401 mpu401_uart.c,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/drivers/mpu401
In directory usw-pr-cvs1:/tmp/cvs-serv19718/drivers/mpu401
Modified Files:
mpu401_uart.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: mpu401_uart.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/mpu401/mpu401_uart.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mpu401_uart.c 29 Apr 2002 06:48:34 - 1.12
+++ mpu401_uart.c 13 Aug 2002 16:13:35 - 1.13
@@ -350,16 +350,16 @@
static snd_rawmidi_ops_t snd_mpu401_uart_output =
{
- open: snd_mpu401_uart_output_open,
- close: snd_mpu401_uart_output_close,
- trigger:snd_mpu401_uart_output_trigger,
+ .open = snd_mpu401_uart_output_open,
+ .close =snd_mpu401_uart_output_close,
+ .trigger = snd_mpu401_uart_output_trigger,
};
static snd_rawmidi_ops_t snd_mpu401_uart_input =
{
- open: snd_mpu401_uart_input_open,
- close: snd_mpu401_uart_input_close,
- trigger:snd_mpu401_uart_input_trigger,
+ .open = snd_mpu401_uart_input_open,
+ .close =snd_mpu401_uart_input_close,
+ .trigger = snd_mpu401_uart_input_trigger,
};
static void snd_mpu401_uart_free(snd_rawmidi_t *rmidi)
---
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
[alsa-cvslog] CVS: alsa-kernel/core/seq/oss seq_oss.c,1.7,1.8
Update of /cvsroot/alsa/alsa-kernel/core/seq/oss
In directory usw-pr-cvs1:/tmp/cvs-serv19718/core/seq/oss
Modified Files:
seq_oss.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: seq_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/oss/seq_oss.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- seq_oss.c 25 May 2002 10:26:07 - 1.7
+++ seq_oss.c 13 Aug 2002 16:13:35 - 1.8
@@ -195,19 +195,19 @@
static struct file_operations seq_oss_f_ops =
{
#ifndef LINUX_2_2
- owner: THIS_MODULE,
+ .owner =THIS_MODULE,
#endif
- read: odev_read,
- write: odev_write,
- open: odev_open,
- release:odev_release,
- poll: odev_poll,
- ioctl: odev_ioctl,
+ .read = odev_read,
+ .write =odev_write,
+ .open = odev_open,
+ .release = odev_release,
+ .poll = odev_poll,
+ .ioctl =odev_ioctl,
};
static snd_minor_t seq_oss_reg = {
- comment:"sequencer",
- f_ops: &seq_oss_f_ops,
+ .comment = "sequencer",
+ .f_ops =&seq_oss_f_ops,
};
static int __init
---
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
[alsa-cvslog] CVS: alsa-kernel sound_core.c,1.7,1.8
Update of /cvsroot/alsa/alsa-kernel
In directory usw-pr-cvs1:/tmp/cvs-serv19718
Modified Files:
sound_core.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: sound_core.c
===
RCS file: /cvsroot/alsa/alsa-kernel/sound_core.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sound_core.c6 Aug 2002 19:06:44 - 1.7
+++ sound_core.c13 Aug 2002 16:13:33 - 1.8
@@ -460,8 +460,8 @@
static struct file_operations soundcore_fops=
{
/* We must have an owner or the module locking fails */
- owner: THIS_MODULE,
- open: soundcore_open,
+ .owner = THIS_MODULE,
+ .open = soundcore_open,
};
static struct sound_unit *__look_for_unit(int chain, int unit)
---
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
[alsa-cvslog] CVS: alsa-kernel/pci als4000.c,1.15,1.16 cmipci.c,1.30,1.31 cs4281.c,1.24,1.25 ens1370.c,1.19,1.20 es1938.c,1.13,1.14
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 - 1.15
+++ als4000.c 13 Aug 2002 16:13:39 - 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_c
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.28,1.29
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory usw-pr-cvs1:/tmp/cvs-serv19718/pci/ac97
Modified Files:
ac97_codec.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ac97_codec.c31 Jul 2002 14:25:08 - 1.28
+++ ac97_codec.c13 Aug 2002 16:13:40 - 1.29
@@ -361,9 +361,9 @@
}
#define AC97_ENUM_DOUBLE(xname, reg, shift, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_ac97_info_enum_double, \
- get: snd_ac97_get_enum_double, put: snd_ac97_put_enum_double, \
- private_value: reg | (shift << 8) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info =
+snd_ac97_info_enum_double, \
+ .get = snd_ac97_get_enum_double, .put = snd_ac97_put_enum_double, \
+ .private_value = reg | (shift << 8) | (invert << 24) }
static int snd_ac97_info_enum_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
{
@@ -423,9 +423,9 @@
}
#define AC97_SINGLE(xname, reg, shift, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info: snd_ac97_info_single, \
- get: snd_ac97_get_single, put: snd_ac97_put_single, \
- private_value: reg | (shift << 8) | (mask << 16) | (invert << 24) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info = snd_ac97_info_single, \
+ .get = snd_ac97_get_single, .put = snd_ac97_put_single, \
+ .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
static int snd_ac97_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
{
@@ -468,9 +468,9 @@
}
#define AC97_DOUBLE(xname, reg, shift_left, shift_right, mask, invert) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: (xname), info: snd_ac97_info_double, \
- get: snd_ac97_get_double, put: snd_ac97_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_ac97_info_double,
+\
+ .get = snd_ac97_get_double, .put = snd_ac97_put_double, \
+ .private_value = reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) |
+(invert << 24) }
static int snd_ac97_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
{
@@ -757,25 +757,25 @@
static const snd_kcontrol_new_t snd_ac97_controls_spdif[5] = {
{
- access: SNDRV_CTL_ELEM_ACCESS_READ,
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
- info: snd_ac97_spdif_mask_info,
- get: snd_ac97_spdif_cmask_get,
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,CON_MASK),
+ .info = snd_ac97_spdif_mask_info,
+ .get = snd_ac97_spdif_cmask_get,
},
{
- access: SNDRV_CTL_ELEM_ACCESS_READ,
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
- info: snd_ac97_spdif_mask_info,
- get: snd_ac97_spdif_pmask_get,
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,PRO_MASK),
+ .info = snd_ac97_spdif_mask_info,
+ .get = snd_ac97_spdif_pmask_get,
},
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
- info: snd_ac97_spdif_mask_info,
- get: snd_ac97_spdif_default_get,
- put: snd_ac97_spdif_default_put,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+ .info = snd_ac97_spdif_mask_info,
+ .get = snd_ac97_spdif_default_get,
+ .put = snd_ac97_spdif_default_put,
},
AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH),AC97_EXTENDED_STATUS, 2,
1, 0),
@@ -792,9 +792,9 @@
};
#define AD18XX_PCM_BITS(xname, codec, shift, mask) \
-{ iface: SNDRV_CTL_ELEM_IFACE_MIXER, name: xname, info:
snd_ac97_ad18xx_pcm_info_bits, \
- get: snd_ac97_ad18xx_pcm_get_bits, put: snd_ac97_ad18xx_pcm_put_bits, \
- private_value: codec | (shift << 8) | (mask << 16) }
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .info =
+snd_ac97_ad18xx_pcm_info_bits, \
+ .get = snd_ac97_ad18xx_pcm_get_bits, .put = snd_ac97_ad18xx_pcm_put_bits, \
+ .private_value = codec | (shift << 8) | (mask << 16) }
static int snd_ac97_ad18xx_pcm_info_bits(snd_kcontrol_t *kcontrol,
snd_ctl_elem_info_t * uinfo)
{
@@ -831,9 +831,9 @@
[alsa-cvslog] CVS: alsa-kernel/isa/sb emu8000.c,1.12,1.13 emu8000_callback.c,1.7,1.8 emu8000_pcm.c,1.6,1.7 es968.c,1.10,1.11 sb16_csp.c,1.6,1.7 sb16_main.c,1.10,1.11 sb8_main.c,1.8,1.9 sb8_midi.c,1.6,1.7 sb_common.c,1.13,1.14 sb_mixer.c,1.7,1.8
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/sb
Modified Files:
emu8000.c emu8000_callback.c emu8000_pcm.c es968.c sb16_csp.c
sb16_main.c sb8_main.c sb8_midi.c sb_common.c sb_mixer.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: emu8000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- emu8000.c 12 Aug 2002 08:43:46 - 1.12
+++ emu8000.c 13 Aug 2002 16:13:38 - 1.13
@@ -866,22 +866,22 @@
static snd_kcontrol_new_t mixer_bass_control =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Synth Tone Control - Bass",
- info: mixer_bass_treble_info,
- get: mixer_bass_treble_get,
- put: mixer_bass_treble_put,
- private_value: 0,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Synth Tone Control - Bass",
+ .info = mixer_bass_treble_info,
+ .get = mixer_bass_treble_get,
+ .put = mixer_bass_treble_put,
+ .private_value = 0,
};
static snd_kcontrol_new_t mixer_treble_control =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Synth Tone Control - Treble",
- info: mixer_bass_treble_info,
- get: mixer_bass_treble_get,
- put: mixer_bass_treble_put,
- private_value: 1,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Synth Tone Control - Treble",
+ .info = mixer_bass_treble_info,
+ .get = mixer_bass_treble_get,
+ .put = mixer_bass_treble_put,
+ .private_value = 1,
};
/*
@@ -933,22 +933,22 @@
static snd_kcontrol_new_t mixer_chorus_mode_control =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Chorus Mode",
- info: mixer_chorus_reverb_info,
- get: mixer_chorus_reverb_get,
- put: mixer_chorus_reverb_put,
- private_value: 1,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Chorus Mode",
+ .info = mixer_chorus_reverb_info,
+ .get = mixer_chorus_reverb_get,
+ .put = mixer_chorus_reverb_put,
+ .private_value = 1,
};
static snd_kcontrol_new_t mixer_reverb_mode_control =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "Reverb Mode",
- info: mixer_chorus_reverb_info,
- get: mixer_chorus_reverb_get,
- put: mixer_chorus_reverb_put,
- private_value: 0,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "Reverb Mode",
+ .info = mixer_chorus_reverb_info,
+ .get = mixer_chorus_reverb_get,
+ .put = mixer_chorus_reverb_put,
+ .private_value = 0,
};
/*
@@ -995,22 +995,22 @@
static snd_kcontrol_new_t mixer_fm_chorus_depth_control =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "FM Chorus Depth",
- info: mixer_fm_depth_info,
- get: mixer_fm_depth_get,
- put: mixer_fm_depth_put,
- private_value: 1,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "FM Chorus Depth",
+ .info = mixer_fm_depth_info,
+ .get = mixer_fm_depth_get,
+ .put = mixer_fm_depth_put,
+ .private_value = 1,
};
static snd_kcontrol_new_t mixer_fm_reverb_depth_control =
{
- iface: SNDRV_CTL_ELEM_IFACE_MIXER,
- name: "FM Reverb Depth",
- info: mixer_fm_depth_info,
- get: mixer_fm_depth_get,
- put: mixer_fm_depth_put,
- private_value: 0,
+ .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+ .name = "FM Reverb Depth",
+ .info = mixer_fm_depth_info,
+ .get = mixer_fm_depth_get,
+ .put = mixer_fm_depth_put,
+ .private_value = 0,
};
@@ -1090,7 +1090,7 @@
emu8000_t *hw;
int err;
static snd_device_ops_t ops = {
- dev_free: snd_emu8000_dev_free,
+ .dev_free = snd_emu8000_dev_free,
};
if (awe_ret)
Index: emu8000_callback.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000_callback.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emu8000_callback.c 12 Aug 2002 08:43:46 - 1.7
+++ emu8000_callback.c 13 Aug 2002 16:13:38 - 1.8
@@ -59,21 +59,21 @@
* set up operators
*/
static snd_emux_operators_t emu8000_ops = {
- owner: THIS_MODULE,
- get_voice: get_voice,
- prepare:start_voice,
- trigger:trigger_voice,
- release:release_voice,
- update: update_voice,
- terminate: terminate_voice,
- reset: reset_voice,
- sample_new: snd_emu8000_sample_new,
- sample_free:snd_emu8000_sample_free,
- sample_reset: snd_emu8000_sample_reset,
- load_fx:load_fx,
- sysex: sysex,
+ .owner =THIS_MODULE,
+ .get_voice =
[alsa-cvslog] CVS: alsa-kernel/synth/emux emux_oss.c,1.6,1.7
Update of /cvsroot/alsa/alsa-kernel/synth/emux
In directory usw-pr-cvs1:/tmp/cvs-serv19718/synth/emux
Modified Files:
emux_oss.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: emux_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/synth/emux/emux_oss.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emux_oss.c 12 Aug 2002 08:43:50 - 1.6
+++ emux_oss.c 13 Aug 2002 16:13:40 - 1.7
@@ -44,12 +44,12 @@
/* operators */
static snd_seq_oss_callback_t oss_callback = {
- owner: THIS_MODULE,
- open: snd_emux_open_seq_oss,
- close: snd_emux_close_seq_oss,
- ioctl: snd_emux_ioctl_seq_oss,
- load_patch: snd_emux_load_patch_seq_oss,
- reset: snd_emux_reset_seq_oss,
+ .owner = THIS_MODULE,
+ .open = snd_emux_open_seq_oss,
+ .close = snd_emux_close_seq_oss,
+ .ioctl = snd_emux_ioctl_seq_oss,
+ .load_patch = snd_emux_load_patch_seq_oss,
+ .reset = snd_emux_reset_seq_oss,
};
---
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
[alsa-cvslog] CVS: alsa-kernel/isa/opti9xx opti92x-ad1848.c,1.15,1.16
Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/opti9xx
Modified Files:
opti92x-ad1848.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: opti92x-ad1848.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- opti92x-ad1848.c22 Jul 2002 10:31:45 - 1.15
+++ opti92x-ad1848.c13 Aug 2002 16:13:38 - 1.16
@@ -289,7 +289,7 @@
#define ISAPNP_OPTI9XX(_va, _vb, _vc, _device, _fa, _fb, _fc, _audio, _mpu401) \
{ \
ISAPNP_CARD_ID(_va, _vb, _vc, _device), \
- devs: { ISAPNP_DEVICE_ID(_fa, _fb, _fc, _audio), \
+ .devs = { ISAPNP_DEVICE_ID(_fa, _fb, _fc, _audio), \
ISAPNP_DEVICE_ID(_fa, _fb, _fc, _mpu401), } \
}
@@ -821,9 +821,9 @@
#define RATES sizeof(rates) / sizeof(rates[0])
static snd_pcm_hw_constraint_list_t hw_constraints_rates = {
- count: RATES,
- list: rates,
- mask: 0,
+ .count = RATES,
+ .list = rates,
+ .mask = 0,
};
unsigned char bits[] = { 0x01, 0x0f, 0x00, 0x0e, 0x03, 0x02, 0x05,
@@ -1135,39 +1135,39 @@
static snd_pcm_hardware_t snd_opti93x_playback = {
- info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_SYNC_START),
- formats:(SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_IMA_ADPCM |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+SNDRV_PCM_FMTBIT_IMA_ADPCM |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S16_BE),
- rates: SNDRV_PCM_RATE_KNOT | 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:1,
- periods_max:1024,
- fifo_size: 0,
+ .rates =SNDRV_PCM_RATE_KNOT | 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 = 1,
+ .periods_max = 1024,
+ .fifo_size =0,
};
static snd_pcm_hardware_t snd_opti93x_capture = {
- info: (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+ .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_SYNC_START),
- formats:(SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
SNDRV_PCM_FMTBIT_IMA_ADPCM |
+ .formats = (SNDRV_PCM_FMTBIT_MU_LAW | SNDRV_PCM_FMTBIT_A_LAW |
+SNDRV_PCM_FMTBIT_IMA_ADPCM |
SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S16_BE),
- rates: 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:1,
- periods_max:1024,
- fifo_size: 0,
+ .rates =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 = 1,
+ .periods_max = 1024,
+ .fifo_size =0,
};
static int snd_opti93x_playback_open(snd_pcm_substream_t *substream)
@@ -1289,7 +1289,7 @@
opti93x_t **rcodec)
{
static snd_device_ops_t ops = {
- dev_free: snd_opti93x_dev_free,
+ .dev_free = snd_opti93x_dev_free,
};
int error;
opti93x_t *codec;
@@ -1348,25 +1348,25 @@
}
static snd_pcm_ops_t snd_opti93x_playback_ops = {
- open: snd_opti93x_playback_open,
- close: snd_opti93x_playback_close,
- ioctl:
[alsa-cvslog] CVS: alsa-kernel/isa/wavefront wavefront.c,1.15,1.16 wavefront_midi.c,1.6,1.7
Update of /cvsroot/alsa/alsa-kernel/isa/wavefront
In directory usw-pr-cvs1:/tmp/cvs-serv19718/isa/wavefront
Modified Files:
wavefront.c wavefront_midi.c
Log Message:
C99-like structure initializers - first bunch of changes - me and Rusty Russell
Index: wavefront.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wavefront.c 1 Aug 2002 15:59:56 - 1.15
+++ wavefront.c 13 Aug 2002 16:13:39 - 1.16
@@ -111,14 +111,14 @@
static struct isapnp_card_id snd_wavefront_pnpids[] __devinitdata = {
{
ISAPNP_CARD_ID('C','S','C',0x7532), /* Tropez */
- devs: { ISAPNP_DEVICE_ID('C','S','C',0x), /* WSS */
+ .devs = { ISAPNP_DEVICE_ID('C','S','C',0x), /* WSS */
ISAPNP_DEVICE_ID('C','S','C',0x0010), /* CTRL */
ISAPNP_DEVICE_ID('P','n','P',0xb006), /* MPU */
ISAPNP_DEVICE_ID('C','S','C',04), }, /* SYNTH */
},
{
ISAPNP_CARD_ID('C','S','C',0x7632), /* Tropez+ */
- devs: { ISAPNP_DEVICE_ID('C','S','C',0x), /* WSS */
+ .devs = { ISAPNP_DEVICE_ID('C','S','C',0x), /* WSS */
ISAPNP_DEVICE_ID('C','S','C',0x0010), /* CTRL */
ISAPNP_DEVICE_ID('P','n','P',0xb006), /* MPU */
ISAPNP_DEVICE_ID('C','S','C',04), }, /* SYNTH */
Index: wavefront_midi.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront_midi.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wavefront_midi.c12 Aug 2002 08:43:47 - 1.6
+++ wavefront_midi.c13 Aug 2002 16:13:39 - 1.7
@@ -559,15 +559,15 @@
snd_rawmidi_ops_t snd_wavefront_midi_output =
{
- open: snd_wavefront_midi_output_open,
- close: snd_wavefront_midi_output_close,
- trigger:snd_wavefront_midi_output_trigger,
+ .open = snd_wavefront_midi_output_open,
+ .close =snd_wavefront_midi_output_close,
+ .trigger = snd_wavefront_midi_output_trigger,
};
snd_rawmidi_ops_t snd_wavefront_midi_input =
{
- open: snd_wavefront_midi_input_open,
- close: snd_wavefront_midi_input_close,
- trigger:snd_wavefront_midi_input_trigger,
+ .open = snd_wavefront_midi_input_open,
+ .close =snd_wavefront_midi_input_close,
+ .trigger = snd_wavefront_midi_input_trigger,
};
---
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
