Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory usw-pr-cvs1:/tmp/cvs-serv18246/isa/sb
Modified Files:
es968.c sb16.c sb8.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: es968.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- es968.c 13 Aug 2002 16:13:38 -0000 1.11
+++ es968.c 21 Oct 2002 18:28:22 -0000 1.12
@@ -41,31 +41,31 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{ESS,AudioDrive ES968}}");
-static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
-static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card
*/
-static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */
-static int snd_dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for es968 based soundcard.");
-MODULE_PARM_SYNTAX(snd_index, SNDRV_INDEX_DESC);
-MODULE_PARM(snd_id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
-MODULE_PARM_DESC(snd_id, "ID string for es968 based soundcard.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_enable, "Enable es968 based soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_port, "Port # for es968 driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for es968 driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma8, "8-bit DMA # for es968 driver.");
-MODULE_PARM_SYNTAX(snd_dma8, SNDRV_DMA8_DESC);
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */
+static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for es968 based soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for es968 based soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable es968 based soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for es968 driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for es968 driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma8, "8-bit DMA # for es968 driver.");
+MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC);
struct snd_card_es968 {
#ifdef __ISAPNP__
@@ -123,22 +123,22 @@
if (pdev->prepare(pdev)<0)
return -EAGAIN;
- if (snd_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_port[dev], 16);
- if (snd_dma8[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[0], snd_dma8[dev],
+ if (port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], port[dev], 16);
+ if (dma8[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[0], dma8[dev],
1);
- if (snd_irq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_irq[dev], 1);
+ if (irq[dev] != SNDRV_AUTO_IRQ)
+ isapnp_resource_change(&pdev->irq_resource[0], irq[dev], 1);
if (pdev->activate(pdev)<0) {
snd_printk("AUDIO isapnp configure failure\n");
return -EBUSY;
}
- snd_port[dev] = pdev->resource[0].start;
- snd_dma8[dev] = pdev->dma_resource[0].start;
- snd_irq[dev] = pdev->irq_resource[0].start;
+ port[dev] = pdev->resource[0].start;
+ dma8[dev] = pdev->dma_resource[0].start;
+ irq[dev] = pdev->irq_resource[0].start;
return 0;
}
@@ -170,7 +170,7 @@
snd_card_t *card;
struct snd_card_es968 *acard;
- if ((card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
+ if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof(struct snd_card_es968))) == NULL)
return -ENOMEM;
acard = (struct snd_card_es968 *)card->private_data;
@@ -187,10 +187,10 @@
return -ENOSYS;
#endif /* __ISAPNP__ */
- if ((error = snd_sbdsp_create(card, snd_port[dev],
- snd_irq[dev],
+ if ((error = snd_sbdsp_create(card, port[dev],
+ irq[dev],
snd_card_es968_interrupt,
- snd_dma8[dev],
+ dma8[dev],
-1,
SB_HW_AUTO, &chip)) < 0) {
snd_card_free(card);
@@ -215,7 +215,7 @@
strcpy(card->driver, "ES968");
strcpy(card->shortname, "ESS ES968");
sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d",
- card->shortname, chip->name, chip->port, snd_irq[dev], snd_dma8[dev]);
+ card->shortname, chip->name, chip->port, irq[dev], dma8[dev]);
if ((error = snd_card_register(card)) < 0) {
snd_card_free(card);
@@ -233,7 +233,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev])
+ if (!enable[dev])
continue;
snd_es968_isapnp_cards[dev] = card;
snd_es968_isapnp_id[dev] = id;
@@ -276,8 +276,8 @@
#ifndef MODULE
-/* format is: snd-es968=snd_enable,snd_index,snd_id,
- snd_port,snd_irq,snd_dma1 */
+/* format is: snd-es968=enable,index,id,
+ port,irq,snd_dma1 */
static int __init alsa_card_es968_setup(char *str)
{
@@ -285,12 +285,12 @@
if (nr_dev >= SNDRV_CARDS)
return 0;
- (void)(get_option(&str,&snd_enable[nr_dev]) == 2 &&
- get_option(&str,&snd_index[nr_dev]) == 2 &&
- get_id(&str,&snd_id[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_port[nr_dev]) == 2 &&
- get_option(&str,&snd_irq[nr_dev]) == 2 &&
- get_option(&str,&snd_dma8[nr_dev]) == 2);
+ (void)(get_option(&str,&enable[nr_dev]) == 2 &&
+ get_option(&str,&index[nr_dev]) == 2 &&
+ get_id(&str,&id[nr_dev]) == 2 &&
+ get_option(&str,(int *)&port[nr_dev]) == 2 &&
+ get_option(&str,&irq[nr_dev]) == 2 &&
+ get_option(&str,&dma8[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: sb16.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sb16.c 23 Jul 2002 10:57:00 -0000 1.17
+++ sb16.c 21 Oct 2002 18:28:22 -0000 1.18
@@ -74,78 +74,78 @@
#define SNDRV_SBAWE_EMU8000
#endif
-static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
-static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card
*/
-#ifdef __ISAPNP__
-static int snd_isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
-#endif
-static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /*
0x220,0x240,0x260,0x280 */
-static long snd_mpu_port[SNDRV_CARDS] = {0x330, 0x300,[2 ... (SNDRV_CARDS - 1)] = -1};
-static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
-#ifdef SNDRV_SBAWE_EMU8000
-static long snd_awe_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
-#endif
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
-static int snd_dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
-static int snd_dma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 5,6,7 */
-static int snd_mic_agc[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
+#ifdef __ISAPNP__
+static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+#endif
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260,0x280 */
+static long mpu_port[SNDRV_CARDS] = {0x330, 0x300,[2 ... (SNDRV_CARDS - 1)] = -1};
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+#ifdef SNDRV_SBAWE_EMU8000
+static long awe_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+#endif
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
+static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
+static int dma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 5,6,7 */
+static int mic_agc[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
#ifdef CONFIG_SND_SB16_CSP
-static int snd_csp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+static int csp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
#endif
#ifdef SNDRV_SBAWE_EMU8000
-static int snd_seq_ports[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
+static int seq_ports[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
#endif
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for SoundBlaster 16 soundcard.");
-MODULE_PARM_SYNTAX(snd_index, SNDRV_INDEX_DESC);
-MODULE_PARM(snd_id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
-MODULE_PARM_DESC(snd_id, "ID string for SoundBlaster 16 soundcard.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_enable, "Enable SoundBlaster 16 soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-#ifdef __ISAPNP__
-MODULE_PARM(snd_isapnp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_isapnp, "ISA PnP detection for specified soundcard.");
-MODULE_PARM_SYNTAX(snd_isapnp, SNDRV_ISAPNP_DESC);
-#endif
-MODULE_PARM(snd_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_port, "Port # for SB16 driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED
",allows:{{0x220},{0x240},{0x260},{0x280}},dialog:list");
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port # for SB16 driver.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_ENABLED
",allows:{{0x330},{0x300}},dialog:list");
-MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_fm_port, "FM port # for SB16 PnP driver.");
-MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_ENABLED
",allows:{{0x388},{0x38c},{0x390},{0x394}},dialog:list");
-#ifdef SNDRV_SBAWE_EMU8000
-MODULE_PARM(snd_awe_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_awe_port, "AWE port # for SB16 PnP driver.");
-MODULE_PARM_SYNTAX(snd_awe_port, SNDRV_ENABLED
",allows:{{0x620},{0x640},{0x660},{0x680}},dialog:list");
-#endif
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for SB16 driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma8, "8-bit DMA # for SB16 driver.");
-MODULE_PARM_SYNTAX(snd_dma8, SNDRV_DMA8_DESC);
-MODULE_PARM(snd_dma16, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma16, "16-bit DMA # for SB16 driver.");
-MODULE_PARM_SYNTAX(snd_dma16, SNDRV_DMA16_DESC);
-MODULE_PARM(snd_mic_agc, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_mic_agc, "Mic Auto-Gain-Control switch.");
-MODULE_PARM_SYNTAX(snd_mic_agc, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for SoundBlaster 16 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for SoundBlaster 16 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable SoundBlaster 16 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+#ifdef __ISAPNP__
+MODULE_PARM(isapnp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");
+MODULE_PARM_SYNTAX(isapnp, SNDRV_ISAPNP_DESC);
+#endif
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for SB16 driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED
+",allows:{{0x220},{0x240},{0x260},{0x280}},dialog:list");
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for SB16 driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED ",allows:{{0x330},{0x300}},dialog:list");
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port # for SB16 PnP driver.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED
+",allows:{{0x388},{0x38c},{0x390},{0x394}},dialog:list");
+#ifdef SNDRV_SBAWE_EMU8000
+MODULE_PARM(awe_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(awe_port, "AWE port # for SB16 PnP driver.");
+MODULE_PARM_SYNTAX(awe_port, SNDRV_ENABLED
+",allows:{{0x620},{0x640},{0x660},{0x680}},dialog:list");
+#endif
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for SB16 driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma8, "8-bit DMA # for SB16 driver.");
+MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC);
+MODULE_PARM(dma16, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma16, "16-bit DMA # for SB16 driver.");
+MODULE_PARM_SYNTAX(dma16, SNDRV_DMA16_DESC);
+MODULE_PARM(mic_agc, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mic_agc, "Mic Auto-Gain-Control switch.");
+MODULE_PARM_SYNTAX(mic_agc, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
#ifdef CONFIG_SND_SB16_CSP
-MODULE_PARM(snd_csp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_csp, "ASP/CSP chip support.");
-MODULE_PARM_SYNTAX(snd_csp, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
+MODULE_PARM(csp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(csp, "ASP/CSP chip support.");
+MODULE_PARM_SYNTAX(csp, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
#endif
#ifdef SNDRV_SBAWE_EMU8000
-MODULE_PARM(snd_seq_ports, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_seq_ports, "Number of sequencer ports for WaveTable synth.");
-MODULE_PARM_SYNTAX(snd_seq_ports, SNDRV_ENABLED ",allows:{{0,8}},skill:advanced");
+MODULE_PARM(seq_ports, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(seq_ports, "Number of sequencer ports for WaveTable synth.");
+MODULE_PARM_SYNTAX(seq_ports, SNDRV_ENABLED ",allows:{{0,8}},skill:advanced");
#endif
struct snd_sb16 {
@@ -287,32 +287,32 @@
pdev = acard->dev;
if (pdev->prepare(pdev) < 0)
return -EAGAIN;
- if (snd_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_port[dev], 16);
- if (snd_mpu_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[1], snd_mpu_port[dev], 2);
- if (snd_fm_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[2], snd_fm_port[dev], 4);
- if (snd_dma8[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[0], snd_dma8[dev], 1);
- if (snd_dma16[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[1], snd_dma16[dev], 1);
- if (snd_irq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_irq[dev], 1);
+ if (port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], port[dev], 16);
+ if (mpu_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[1], mpu_port[dev], 2);
+ if (fm_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[2], fm_port[dev], 4);
+ if (dma8[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[0], dma8[dev], 1);
+ if (dma16[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[1], dma16[dev], 1);
+ if (irq[dev] != SNDRV_AUTO_IRQ)
+ isapnp_resource_change(&pdev->irq_resource[0], irq[dev], 1);
if (pdev->activate(pdev) < 0) {
printk(KERN_ERR PFX "isapnp configure failure (out of resources?)\n");
return -EBUSY;
}
- snd_port[dev] = pdev->resource[0].start;
- snd_mpu_port[dev] = pdev->resource[1].start;
- snd_fm_port[dev] = pdev->resource[2].start;
- snd_dma8[dev] = pdev->dma_resource[0].start;
- snd_dma16[dev] = pdev->dma_resource[1].start;
- snd_irq[dev] = pdev->irq_resource[0].start;
+ port[dev] = pdev->resource[0].start;
+ mpu_port[dev] = pdev->resource[1].start;
+ fm_port[dev] = pdev->resource[2].start;
+ dma8[dev] = pdev->dma_resource[0].start;
+ dma16[dev] = pdev->dma_resource[1].start;
+ irq[dev] = pdev->irq_resource[0].start;
snd_printdd("isapnp SB16: port=0x%lx, mpu port=0x%lx, fm port=0x%lx\n",
- snd_port[dev], snd_mpu_port[dev], snd_fm_port[dev]);
+ port[dev], mpu_port[dev], fm_port[dev]);
snd_printdd("isapnp SB16: dma1=%i, dma2=%i, irq=%i\n",
- snd_dma8[dev], snd_dma16[dev], snd_irq[dev]);
+ dma8[dev], dma16[dev], irq[dev]);
#ifdef SNDRV_SBAWE_EMU8000
/* WaveTable initialization */
pdev = acard->devwt;
@@ -320,17 +320,17 @@
acard->dev->deactivate(acard->dev);
return -EAGAIN;
}
- if (snd_awe_port[dev] != SNDRV_AUTO_PORT) {
- isapnp_resource_change(&pdev->resource[0], snd_awe_port[dev], 4);
- isapnp_resource_change(&pdev->resource[1], snd_awe_port[dev] + 0x400,
4);
- isapnp_resource_change(&pdev->resource[2], snd_awe_port[dev] + 0x800,
4);
+ if (awe_port[dev] != SNDRV_AUTO_PORT) {
+ isapnp_resource_change(&pdev->resource[0], awe_port[dev], 4);
+ isapnp_resource_change(&pdev->resource[1], awe_port[dev] + 0x400, 4);
+ isapnp_resource_change(&pdev->resource[2], awe_port[dev] + 0x800, 4);
}
if (pdev->activate(pdev)<0) {
printk(KERN_ERR PFX "WaveTable isapnp configure failure (out of
resources?)\n");
acard->dev->deactivate(acard->dev);
return -EBUSY;
}
- snd_awe_port[dev] = pdev->resource[0].start;
+ awe_port[dev] = pdev->resource[0].start;
snd_printdd("isapnp SB16: wavetable port=0x%lx\n", pdev->resource[0].start);
#endif
return 0;
@@ -372,76 +372,76 @@
static int possible_irqs[] = {5, 9, 10, 7, -1};
static int possible_dmas8[] = {1, 3, 0, -1};
static int possible_dmas16[] = {5, 6, 7, -1};
- int irq, dma8, dma16;
+ int xirq, xdma8, xdma16;
sb_t *chip;
snd_card_t *card;
struct snd_sb16 *acard;
opl3_t *opl3;
snd_hwdep_t *synth = NULL;
#ifdef CONFIG_SND_SB16_CSP
- snd_hwdep_t *csp = NULL;
+ snd_hwdep_t *xcsp = NULL;
#endif
unsigned long flags;
int err;
- card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
+ card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof(struct snd_sb16));
if (card == NULL)
return -ENOMEM;
acard = (struct snd_sb16 *) card->private_data;
card->private_free = snd_sb16_free;
#ifdef __ISAPNP__
- if (snd_isapnp[dev] && snd_sb16_isapnp(dev, acard) < 0) {
+ if (isapnp[dev] && snd_sb16_isapnp(dev, acard) < 0) {
snd_card_free(card);
return -EBUSY;
}
#endif
- irq = snd_irq[dev];
- dma8 = snd_dma8[dev];
- dma16 = snd_dma16[dev];
+ xirq = irq[dev];
+ xdma8 = dma8[dev];
+ xdma16 = dma16[dev];
#ifdef __ISAPNP__
- if (!snd_isapnp[dev]) {
+ if (!isapnp[dev]) {
#endif
- if (irq == SNDRV_AUTO_IRQ) {
- if ((irq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
+ if (xirq == SNDRV_AUTO_IRQ) {
+ if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
snd_card_free(card);
printk(KERN_ERR PFX "unable to find a free IRQ\n");
return -EBUSY;
}
}
- if (dma8 == SNDRV_AUTO_DMA) {
- if ((dma8 = snd_legacy_find_free_dma(possible_dmas8)) < 0) {
+ if (xdma8 == SNDRV_AUTO_DMA) {
+ if ((xdma8 = snd_legacy_find_free_dma(possible_dmas8)) < 0) {
snd_card_free(card);
printk(KERN_ERR PFX "unable to find a free 8-bit DMA\n");
return -EBUSY;
}
}
- if (dma16 == SNDRV_AUTO_DMA) {
- if ((dma16 = snd_legacy_find_free_dma(possible_dmas16)) < 0) {
+ if (xdma16 == SNDRV_AUTO_DMA) {
+ if ((xdma16 = snd_legacy_find_free_dma(possible_dmas16)) < 0) {
snd_card_free(card);
printk(KERN_ERR PFX "unable to find a free 16-bit DMA\n");
return -EBUSY;
}
}
/* non-PnP FM port address is hardwired with base port address */
- snd_fm_port[dev] = snd_port[dev];
+ fm_port[dev] = port[dev];
/* block the 0x388 port to avoid PnP conflicts */
acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
#ifdef SNDRV_SBAWE_EMU8000
/* non-PnP AWE port address is hardwired with base port address */
- snd_awe_port[dev] = snd_port[dev] + 0x400;
+ awe_port[dev] = port[dev] + 0x400;
#endif
#ifdef __ISAPNP__
}
#endif
if ((err = snd_sbdsp_create(card,
- snd_port[dev],
- irq,
+ port[dev],
+ xirq,
snd_sb16dsp_interrupt,
- dma8,
- dma16,
+ xdma8,
+ xdma16,
SB_HW_AUTO,
&chip)) < 0) {
snd_card_free(card);
@@ -449,12 +449,12 @@
}
if (chip->hardware != SB_HW_16) {
snd_card_free(card);
- snd_printdd("SB 16 chip was not detected at 0x%lx\n", snd_port[dev]);
+ snd_printdd("SB 16 chip was not detected at 0x%lx\n", port[dev]);
return -ENODEV;
}
- chip->mpu_port = snd_mpu_port[dev];
+ chip->mpu_port = mpu_port[dev];
#ifdef __ISAPNP__
- if (!snd_isapnp[dev] && (err = snd_sb16dsp_configure(chip)) < 0) {
+ if (!isapnp[dev] && (err = snd_sb16dsp_configure(chip)) < 0) {
#else
if ((err = snd_sb16dsp_configure(chip)) < 0) {
#endif
@@ -469,21 +469,21 @@
if (chip->mpu_port) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
chip->mpu_port, 0,
- irq, 0, &chip->rmidi)) < 0) {
+ xirq, 0, &chip->rmidi)) < 0) {
snd_card_free(card);
return -ENXIO;
}
}
- if (snd_fm_port[dev] > 0) {
- if (snd_opl3_create(card, snd_fm_port[dev], snd_fm_port[dev] + 2,
- OPL3_HW_OPL3, snd_fm_port[dev] == snd_port[dev],
+ if (fm_port[dev] > 0) {
+ if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,
+ OPL3_HW_OPL3, fm_port[dev] == port[dev],
&opl3) < 0) {
printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
- snd_fm_port[dev], snd_fm_port[dev] + 2);
+ fm_port[dev], fm_port[dev] + 2);
} else {
#ifdef SNDRV_SBAWE_EMU8000
- int seqdev = snd_awe_port[dev] > 0 ? 2 : 1;
+ int seqdev = awe_port[dev] > 0 ? 2 : 1;
#else
int seqdev = 1;
#endif
@@ -501,10 +501,10 @@
#ifdef CONFIG_SND_SB16_CSP
/* CSP chip on SB16ASP/AWE32 */
- if ((chip->hardware == SB_HW_16) && snd_csp[dev]) {
- snd_sb_csp_new(chip, synth != NULL ? 1 : 0, &csp);
- if (csp) {
- chip->csp = csp->private_data;
+ if ((chip->hardware == SB_HW_16) && csp[dev]) {
+ snd_sb_csp_new(chip, synth != NULL ? 1 : 0, &xcsp);
+ if (xcsp) {
+ chip->csp = xcsp->private_data;
chip->hardware = SB_HW_16CSP;
} else {
printk(KERN_INFO PFX "warning - CSP chip not detected on
soundcard #%i\n", dev + 1);
@@ -512,10 +512,10 @@
}
#endif
#ifdef SNDRV_SBAWE_EMU8000
- if (snd_awe_port[dev] > 0) {
- if (snd_emu8000_new(card, 1, snd_awe_port[dev],
- snd_seq_ports[dev], NULL) < 0) {
- printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not
detected at 0x%lx\n", snd_awe_port[dev]);
+ if (awe_port[dev] > 0) {
+ if (snd_emu8000_new(card, 1, awe_port[dev],
+ seq_ports[dev], NULL) < 0) {
+ printk(KERN_ERR PFX "fatal error - EMU-8000 synthesizer not
+detected at 0x%lx\n", awe_port[dev]);
snd_card_free(card);
return -ENXIO;
}
@@ -526,24 +526,24 @@
spin_lock_irqsave(&chip->mixer_lock, flags);
snd_sbmixer_write(chip, SB_DSP4_MIC_AGC,
(snd_sbmixer_read(chip, SB_DSP4_MIC_AGC) & 0x01) |
- (snd_mic_agc[dev] ? 0x00 : 0x01));
+ (mic_agc[dev] ? 0x00 : 0x01));
spin_unlock_irqrestore(&chip->mixer_lock, flags);
strcpy(card->driver,
#ifdef SNDRV_SBAWE_EMU8000
- snd_awe_port[dev] > 0 ? "SB AWE" :
+ awe_port[dev] > 0 ? "SB AWE" :
#endif
"SB16");
strcpy(card->shortname, chip->name);
sprintf(card->longname, "%s at 0x%lx, irq %i, dma ",
chip->name,
chip->port,
- irq);
- if (dma8 >= 0)
- sprintf(card->longname + strlen(card->longname), "%d", dma8);
- if (dma16 >= 0)
+ xirq);
+ if (xdma8 >= 0)
+ sprintf(card->longname + strlen(card->longname), "%d", xdma8);
+ if (xdma16 >= 0)
sprintf(card->longname + strlen(card->longname), "%s%d",
- dma8 >= 0 ? "&" : "", dma16);
+ xdma8 >= 0 ? "&" : "", xdma16);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
return err;
@@ -552,22 +552,22 @@
return 0;
}
-static int __init snd_sb16_probe_legacy_port(unsigned long port)
+static int __init snd_sb16_probe_legacy_port(unsigned long xport)
{
static int dev;
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev] || snd_port[dev] != SNDRV_AUTO_PORT)
+ if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
continue;
#ifdef __ISAPNP__
- if (snd_isapnp[dev])
+ if (isapnp[dev])
continue;
#endif
- snd_port[dev] = port;
+ port[dev] = xport;
res = snd_sb16_probe(dev);
if (res < 0)
- snd_port[dev] = SNDRV_AUTO_PORT;
+ port[dev] = SNDRV_AUTO_PORT;
return res;
}
return -ENODEV;
@@ -582,7 +582,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev] || !snd_isapnp[dev])
+ if (!enable[dev] || !isapnp[dev])
continue;
snd_sb16_isapnp_cards[dev] = card;
snd_sb16_isapnp_id[dev] = id;
@@ -605,10 +605,10 @@
/* legacy non-auto cards at first */
for (dev = 0; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev] || snd_port[dev] == SNDRV_AUTO_PORT)
+ if (!enable[dev] || port[dev] == SNDRV_AUTO_PORT)
continue;
#ifdef __ISAPNP__
- if (snd_isapnp[dev])
+ if (isapnp[dev])
continue;
#endif
if (!snd_sb16_probe(dev)) {
@@ -616,7 +616,7 @@
continue;
}
#ifdef MODULE
- printk(KERN_ERR "Sound Blaster 16+ soundcard #%i not found at 0x%lx or
device busy\n", dev, snd_port[dev]);
+ printk(KERN_ERR "Sound Blaster 16+ soundcard #%i not found at 0x%lx or
+device busy\n", dev, port[dev]);
#endif
}
/* legacy auto configured cards */
@@ -653,11 +653,11 @@
#ifndef MODULE
-/* format is: snd-sb16=snd_enable,snd_index,snd_id,snd_isapnp,
- snd_port,snd_mpu_port,snd_fm_port,
- snd_irq,snd_dma8,snd_dma16,
- snd_mic_agc,snd_csp,
- [snd_awe_port,snd_seq_ports] */
+/* format is: snd-sb16=enable,index,id,isapnp,
+ port,mpu_port,fm_port,
+ irq,dma8,dma16,
+ mic_agc,csp,
+ [awe_port,seq_ports] */
static int __init alsa_card_sb16_setup(char *str)
{
@@ -667,34 +667,34 @@
if (nr_dev >= SNDRV_CARDS)
return 0;
- (void)(get_option(&str,&snd_enable[nr_dev]) == 2 &&
- get_option(&str,&snd_index[nr_dev]) == 2 &&
- get_id(&str,&snd_id[nr_dev]) == 2 &&
+ (void)(get_option(&str,&enable[nr_dev]) == 2 &&
+ get_option(&str,&index[nr_dev]) == 2 &&
+ get_id(&str,&id[nr_dev]) == 2 &&
get_option(&str,&pnp) == 2 &&
- get_option(&str,(int *)&snd_port[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_mpu_port[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_fm_port[nr_dev]) == 2 &&
- get_option(&str,&snd_irq[nr_dev]) == 2 &&
- get_option(&str,&snd_dma8[nr_dev]) == 2 &&
- get_option(&str,&snd_dma16[nr_dev]) == 2 &&
- get_option(&str,&snd_mic_agc[nr_dev]) == 2
+ get_option(&str,(int *)&port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&mpu_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&fm_port[nr_dev]) == 2 &&
+ get_option(&str,&irq[nr_dev]) == 2 &&
+ get_option(&str,&dma8[nr_dev]) == 2 &&
+ get_option(&str,&dma16[nr_dev]) == 2 &&
+ get_option(&str,&mic_agc[nr_dev]) == 2
#ifdef CONFIG_SND_SB16_CSP
&&
- get_option(&str,&snd_csp[nr_dev]) == 2
+ get_option(&str,&csp[nr_dev]) == 2
#endif
#ifdef SNDRV_SBAWE_EMU8000
&&
- get_option(&str,(int *)&snd_awe_port[nr_dev]) == 2 &&
- get_option(&str,&snd_seq_ports[nr_dev]) == 2
+ get_option(&str,(int *)&awe_port[nr_dev]) == 2 &&
+ get_option(&str,&seq_ports[nr_dev]) == 2
#endif
);
#ifdef __ISAPNP__
if (pnp != INT_MAX)
- snd_isapnp[nr_dev] = pnp;
+ isapnp[nr_dev] = pnp;
#endif
#ifdef CONFIG_SND_SB16_CSP
if (csp != INT_MAX)
- snd_csp[nr_dev] = csp;
+ csp[nr_dev] = csp;
#endif
nr_dev++;
return 1;
Index: sb8.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb8.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sb8.c 25 May 2002 10:26:10 -0000 1.12
+++ sb8.c 21 Oct 2002 18:28:22 -0000 1.13
@@ -38,31 +38,31 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{Creative Labs,SB 1.0/SB 2.0/SB Pro}}");
-static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
-static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
-static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260 */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
-static int snd_dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3 */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Sound Blaster soundcard.");
-MODULE_PARM_SYNTAX(snd_index, SNDRV_INDEX_DESC);
-MODULE_PARM(snd_id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
-MODULE_PARM_DESC(snd_id, "ID string for Sound Blaster soundcard.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_enable, "Enable Sound Blaster soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_port, "Port # for SB8 driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for SB8 driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma8, "8-bit DMA # for SB8 driver.");
-MODULE_PARM_SYNTAX(snd_dma8, SNDRV_DMA8_DESC);
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
+static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3 */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Sound Blaster soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for Sound Blaster soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable Sound Blaster soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for SB8 driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for SB8 driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma8, "8-bit DMA # for SB8 driver.");
+MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC);
struct snd_sb8 {
struct resource *fm_res; /* used to block FM i/o region for legacy
cards */
@@ -101,7 +101,7 @@
opl3_t *opl3;
int err;
- card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
+ card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof(struct snd_sb8));
if (card == NULL)
return -ENOMEM;
@@ -111,9 +111,9 @@
/* block the 0x388 port to avoid PnP conflicts */
acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
- if ((err = snd_sbdsp_create(card, snd_port[dev], snd_irq[dev],
+ if ((err = snd_sbdsp_create(card, port[dev], irq[dev],
snd_sb8_interrupt,
- snd_dma8[dev],
+ dma8[dev],
-1,
SB_HW_AUTO,
&chip)) < 0) {
@@ -124,10 +124,10 @@
snd_card_free(card);
if (chip->hardware == SB_HW_ALS100)
snd_printdd("ALS100 chip detected at 0x%lx, try
snd-card-als100 module\n",
- snd_port[dev]);
+ port[dev]);
else
snd_printdd("SB 16 chip detected at 0x%lx, try snd-card-sb16
module\n",
- snd_port[dev]);
+ port[dev]);
return -ENODEV;
}
@@ -170,7 +170,7 @@
sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
chip->name,
chip->port,
- snd_irq[dev], snd_dma8[dev]);
+ irq[dev], dma8[dev]);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
return err;
@@ -179,18 +179,18 @@
return 0;
}
-static int __init snd_card_sb8_legacy_auto_probe(unsigned long port)
+static int __init snd_card_sb8_legacy_auto_probe(unsigned long xport)
{
static int dev;
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev] || snd_port[dev] != SNDRV_AUTO_PORT)
+ if (!enable[dev] || port[dev] != SNDRV_AUTO_PORT)
continue;
- snd_port[dev] = port;
+ port[dev] = xport;
res = snd_sb8_probe(dev);
if (res < 0)
- snd_port[dev] = SNDRV_AUTO_PORT;
+ port[dev] = SNDRV_AUTO_PORT;
return res;
}
return -ENODEV;
@@ -201,8 +201,8 @@
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, -1};
int dev, cards;
- for (dev = cards = 0; dev < SNDRV_CARDS && snd_enable[dev]; dev++) {
- if (snd_port[dev] == SNDRV_AUTO_PORT)
+ for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev]; dev++) {
+ if (port[dev] == SNDRV_AUTO_PORT)
continue;
if (snd_sb8_probe(dev) >= 0)
cards++;
@@ -230,8 +230,8 @@
#ifndef MODULE
-/* format is: snd-sb8=snd_enable,snd_index,snd_id,
- snd_port,snd_irq,snd_dma8 */
+/* format is: snd-sb8=enable,index,id,
+ port,irq,dma8 */
static int __init alsa_card_sb8_setup(char *str)
{
@@ -239,12 +239,12 @@
if (nr_dev >= SNDRV_CARDS)
return 0;
- (void)(get_option(&str,&snd_enable[nr_dev]) == 2 &&
- get_option(&str,&snd_index[nr_dev]) == 2 &&
- get_id(&str,&snd_id[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_port[nr_dev]) == 2 &&
- get_option(&str,&snd_irq[nr_dev]) == 2 &&
- get_option(&str,&snd_dma8[nr_dev]) == 2);
+ (void)(get_option(&str,&enable[nr_dev]) == 2 &&
+ get_option(&str,&index[nr_dev]) == 2 &&
+ get_id(&str,&id[nr_dev]) == 2 &&
+ get_option(&str,(int *)&port[nr_dev]) == 2 &&
+ get_option(&str,&irq[nr_dev]) == 2 &&
+ get_option(&str,&dma8[nr_dev]) == 2);
nr_dev++;
return 1;
}
-------------------------------------------------------
This sf.net emial is sponsored by: Influence the future of
Java(TM) technology. Join the Java Community Process(SM) (JCP(SM))
program now. http://ad.doubleclick.net/clk;4699841;7576298;k?
http://www.sun.com/javavote
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
