Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2800/pci/ice1712
Modified Files:
ice1712.c ice1712.h
Log Message:
Added cs8427_timeout parameter to the ICE1712 driver
Index: ice1712.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1712.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ice1712.c 6 Mar 2004 16:51:30 -0000 1.44
+++ ice1712.c 20 Mar 2004 13:10:14 -0000 1.45
@@ -82,6 +82,7 @@
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this
card */
static int omni[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 0}; /* Delta44 & 66 Omni
I/O support */
+static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 50}; /* CS8427
S/PDIF transciever reset timeout value in HZ/100 */
MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(index, "Index value for ICE1712 soundcard.");
@@ -95,6 +96,9 @@
MODULE_PARM(omni, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(omni, "Enable Midiman M-Audio Delta Omni I/O support.");
MODULE_PARM_SYNTAX(omni, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
+MODULE_PARM(cs8427_timeout, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(cs8427_timeout, "Define reset timeout for cs8427 chip in HZ/100
resolution.");
+MODULE_PARM_SYNTAX(cs8427_timeout, SNDRV_ENABLED ",
allows:{{1,100}},default=50,skill:advanced");
#ifndef PCI_VENDOR_ID_ICE
#define PCI_VENDOR_ID_ICE 0x1412
@@ -386,7 +390,9 @@
{
int err;
- if ((err = snd_cs8427_create(ice->i2c, addr, &ice->cs8427)) < 0) {
+ if ((err = snd_cs8427_create(ice->i2c, addr,
+ (ice->cs8427_timeout * HZ) / 100,
+ &ice->cs8427)) < 0) {
snd_printk("CS8427 initialization failed\n");
return err;
}
@@ -2404,6 +2410,7 @@
static int __devinit snd_ice1712_create(snd_card_t * card,
struct pci_dev *pci,
int omni,
+ int cs8427_timeout,
ice1712_t ** r_ice1712)
{
ice1712_t *ice;
@@ -2428,6 +2435,11 @@
if (ice == NULL)
return -ENOMEM;
ice->omni = omni ? 1 : 0;
+ if (cs8427_timeout < 1)
+ cs8427_timeout = 1;
+ else if (cs8427_timeout > 100)
+ cs8427_timeout = 100;
+ ice->cs8427_timeout = cs8427_timeout;
spin_lock_init(&ice->reg_lock);
init_MUTEX(&ice->gpio_mutex);
init_MUTEX(&ice->open_mutex);
@@ -2547,7 +2559,7 @@
strcpy(card->driver, "ICE1712");
strcpy(card->shortname, "ICEnsemble ICE1712");
- if ((err = snd_ice1712_create(card, pci, omni[dev], &ice)) < 0) {
+ if ((err = snd_ice1712_create(card, pci, omni[dev], cs8427_timeout[dev],
&ice)) < 0) {
snd_card_free(card);
return err;
}
Index: ice1712.h
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1712.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ice1712.h 5 Mar 2004 09:08:39 -0000 1.17
+++ ice1712.h 20 Mar 2004 13:10:14 -0000 1.18
@@ -346,6 +346,7 @@
snd_i2c_bus_t *i2c; /* I2C bus */
snd_i2c_device_t *cs8404; /* CS8404A I2C device */
snd_i2c_device_t *cs8427; /* CS8427 I2C device */
+ unsigned int cs8427_timeout; /* CS8427 reset timeout in HZ/100 */
snd_i2c_device_t *i2cdevs[2]; /* additional i2c devices */
struct ice1712_gpio {
-------------------------------------------------------
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
