Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23690
Modified Files:
via82xx.c
Log Message:
patch was applied wrongly. fixed the rate restriction of spdif output
again.
Index: via82xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- via82xx.c 8 Mar 2004 10:37:06 -0000 1.92
+++ via82xx.c 8 Mar 2004 16:37:21 -0000 1.93
@@ -107,7 +107,7 @@
MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ",default:48000");
MODULE_PARM(ac97_quirk, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
-MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED
",allows:{{-1,3}},dialog:list,default:-1");
+MODULE_PARM_SYNTAX(ac97_quirk, SNDRV_ENABLED
",allows:{{-1,4}},dialog:list,default:-1");
MODULE_PARM(dxs_support, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 =
disable, 3 = 48k only, 4 = no VRA)");
MODULE_PARM_SYNTAX(dxs_support, SNDRV_ENABLED ",allows:{{0,4}},dialog:list");
@@ -1063,7 +1063,6 @@
{48000, SNDRV_PCM_RATE_48000},
};
int i;
- u8 val;
runtime->hw = snd_via82xx_hw;
@@ -1435,8 +1434,6 @@
spin_lock_irqsave(&chip->reg_lock, flags);
oval = inb(port);
val = oval & ~VIA_REG_CAPTURE_CHANNEL_MIC;
- /* save the spdif flag for rate filtering */
- chip->spdif_on = ucontrol->value.integer.value[0] ? 1 : 0;
if (ucontrol->value.enumerated.item[0])
val |= VIA_REG_CAPTURE_CHANNEL_MIC;
if (val != oval)
@@ -1481,6 +1478,8 @@
val = oval & ~VIA8233_SPDIF_DX3;
if (ucontrol->value.integer.value[0])
val |= VIA8233_SPDIF_DX3;
+ /* save the spdif flag for rate filtering */
+ chip->spdif_on = ucontrol->value.integer.value[0] ? 1 : 0;
if (val != oval) {
pci_write_config_byte(chip->pci, VIA8233_SPDIF_CTRL, val);
return 1;
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
