Update of /cvsroot/alsa/alsa-kernel/isa
In directory usw-pr-cvs1:/tmp/cvs-serv18246/isa
Modified Files:
als100.c azt2320.c cmi8330.c dt019x.c es18xx.c opl3sa2.c
sgalaxy.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: als100.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/als100.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- als100.c 13 Oct 2002 12:44:14 -0000 1.12
+++ als100.c 21 Oct 2002 18:28:21 -0000 1.13
@@ -53,47 +53,47 @@
"{Avance Logic,ALS120},"
"{RTL,RTL3000}}");
-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 long snd_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* PnP setup */
-static int snd_mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* PnP setup */
-static int snd_dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
-static int snd_dma16[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 als100 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 als100 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 als100 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 als100 driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port # for als100 driver.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_fm_port, "FM port # for als100 driver.");
-MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for als100 driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_mpu_irq, "MPU-401 IRQ # for als100 driver.");
-MODULE_PARM_SYNTAX(snd_mpu_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma8, "8-bit DMA # for als100 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 als100 driver.");
-MODULE_PARM_SYNTAX(snd_dma16, SNDRV_DMA16_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 long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* PnP setup */
+static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* PnP setup */
+static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
+static int dma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for als100 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 als100 based soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable als100 based soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for als100 driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for als100 driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_PORT12_DESC);
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port # for als100 driver.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_PORT12_DESC);
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for als100 driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for als100 driver.");
+MODULE_PARM_SYNTAX(mpu_irq, SNDRV_IRQ_DESC);
+MODULE_PARM(dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma8, "8-bit DMA # for als100 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 als100 driver.");
+MODULE_PARM_SYNTAX(dma16, SNDRV_DMA16_DESC);
struct snd_card_als100 {
#ifdef __ISAPNP__
@@ -165,64 +165,64 @@
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_dma16[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[1], snd_dma16[dev],
+ if (dma16[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[1], dma16[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) {
printk(KERN_ERR PFX "AUDIO isapnp configure failure\n");
return -EBUSY;
}
- snd_port[dev] = pdev->resource[0].start;
- snd_dma8[dev] = pdev->dma_resource[1].start;
- snd_dma16[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[1].start;
+ dma16[dev] = pdev->dma_resource[0].start;
+ irq[dev] = pdev->irq_resource[0].start;
pdev = acard->devmpu;
if (pdev == NULL || pdev->prepare(pdev)<0) {
- snd_mpu_port[dev] = -1;
+ mpu_port[dev] = -1;
return 0;
}
- if (snd_mpu_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_mpu_port[dev],
+ if (mpu_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], mpu_port[dev],
2);
- if (snd_mpu_irq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_mpu_irq[dev],
+ if (mpu_irq[dev] != SNDRV_AUTO_IRQ)
+ isapnp_resource_change(&pdev->irq_resource[0], mpu_irq[dev],
1);
if (pdev->activate(pdev)<0) {
printk(KERN_ERR PFX "MPU-401 isapnp configure failure\n");
- snd_mpu_port[dev] = -1;
+ mpu_port[dev] = -1;
acard->devmpu = NULL;
} else {
- snd_mpu_port[dev] = pdev->resource[0].start;
- snd_mpu_irq[dev] = pdev->irq_resource[0].start;
+ mpu_port[dev] = pdev->resource[0].start;
+ mpu_irq[dev] = pdev->irq_resource[0].start;
}
pdev = acard->devopl;
if (pdev == NULL || pdev->prepare(pdev)<0) {
- snd_fm_port[dev] = -1;
+ fm_port[dev] = -1;
return 0;
}
- if (snd_fm_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_fm_port[dev], 4);
+ if (fm_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], fm_port[dev], 4);
if (pdev->activate(pdev)<0) {
printk(KERN_ERR PFX "OPL isapnp configure failure\n");
- snd_fm_port[dev] = -1;
+ fm_port[dev] = -1;
acard->devopl = NULL;
} else {
- snd_fm_port[dev] = pdev->resource[0].start;
+ fm_port[dev] = pdev->resource[0].start;
}
return 0;
@@ -264,7 +264,7 @@
struct snd_card_als100 *acard;
opl3_t *opl3;
- 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_als100))) == NULL)
return -ENOMEM;
acard = (struct snd_card_als100 *)card->private_data;
@@ -281,11 +281,11 @@
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_sb16dsp_interrupt,
- snd_dma8[dev],
- snd_dma16[dev],
+ dma8[dev],
+ dma16[dev],
SB_HW_ALS100, &chip)) < 0) {
snd_card_free(card);
return error;
@@ -301,20 +301,20 @@
return error;
}
- if (snd_mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0) {
if (snd_mpu401_uart_new(card, 0, MPU401_HW_ALS100,
- snd_mpu_port[dev], 0,
- snd_mpu_irq[dev], SA_INTERRUPT,
+ mpu_port[dev], 0,
+ mpu_irq[dev], SA_INTERRUPT,
NULL) < 0)
- printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
snd_mpu_port[dev]);
+ printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
+mpu_port[dev]);
}
- if (snd_fm_port[dev] > 0) {
+ if (fm_port[dev] > 0) {
if (snd_opl3_create(card,
- snd_fm_port[dev], snd_fm_port[dev] + 2,
+ fm_port[dev], fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &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 {
if ((error = snd_opl3_timer_new(opl3, 0, 1)) < 0) {
snd_card_free(card);
@@ -331,7 +331,7 @@
strcpy(card->shortname, "Avance Logic ALS100");
sprintf(card->longname, "%s soundcard, %s at 0x%lx, irq %d, dma %d&%d",
card->shortname, chip->name, chip->port,
- snd_irq[dev], snd_dma8[dev], snd_dma16[dev]);
+ irq[dev], dma8[dev], dma16[dev]);
if ((error = snd_card_register(card)) < 0) {
snd_card_free(card);
return error;
@@ -348,7 +348,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev])
+ if (!enable[dev])
continue;
snd_als100_isapnp_cards[dev] = card;
snd_als100_isapnp_id[dev] = id;
@@ -391,9 +391,9 @@
#ifndef MODULE
-/* format is: snd-als100=snd_enable,snd_index,snd_id,snd_port,
- snd_mpu_port,snd_fm_port,snd_irq,snd_mpu_irq,
- snd_dma8,snd_dma16 */
+/* format is: snd-als100=enable,index,id,port,
+ mpu_port,fm_port,irq,mpu_irq,
+ dma8,dma16 */
static int __init alsa_card_als100_setup(char *str)
{
@@ -401,16 +401,16 @@
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,(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_mpu_irq[nr_dev]) == 2 &&
- get_option(&str,&snd_dma8[nr_dev]) == 2 &&
- get_option(&str,&snd_dma16[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,(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,&mpu_irq[nr_dev]) == 2 &&
+ get_option(&str,&dma8[nr_dev]) == 2 &&
+ get_option(&str,&dma16[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: azt2320.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/azt2320.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- azt2320.c 25 May 2002 10:26:08 -0000 1.11
+++ azt2320.c 21 Oct 2002 18:28:21 -0000 1.12
@@ -62,51 +62,51 @@
"{Aztech Systems,AZT2320},"
"{Aztech Systems,AZT3000}}");
-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 long snd_wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static long snd_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */
-static int snd_mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */
-static int snd_dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
-static int snd_dma2[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 azt2320 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 azt2320 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 azt2320 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 azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_wss_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_wss_port, "WSS Port # for azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_wss_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port # for azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_fm_port, "FM port # for azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_mpu_irq, "MPU-401 IRQ # for azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_mpu_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma1, "1st DMA # for azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_dma1, SNDRV_DMA_DESC);
-MODULE_PARM(snd_dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma2, "2nd DMA # for azt2320 driver.");
-MODULE_PARM_SYNTAX(snd_dma2, SNDRV_DMA_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 long wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */
+static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* Pnp setup */
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
+static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* PnP setup */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for azt2320 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 azt2320 based soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable azt2320 based soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for azt2320 driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
+MODULE_PARM(wss_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(wss_port, "WSS Port # for azt2320 driver.");
+MODULE_PARM_SYNTAX(wss_port, SNDRV_PORT12_DESC);
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for azt2320 driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_PORT12_DESC);
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port # for azt2320 driver.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_PORT12_DESC);
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for azt2320 driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for azt2320 driver.");
+MODULE_PARM_SYNTAX(mpu_irq, SNDRV_IRQ_DESC);
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "1st DMA # for azt2320 driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_DMA_DESC);
+MODULE_PARM(dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma2, "2nd DMA # for azt2320 driver.");
+MODULE_PARM_SYNTAX(dma2, SNDRV_DMA_DESC);
struct snd_card_azt2320 {
#ifdef __ISAPNP__
@@ -174,55 +174,55 @@
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_fm_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[1], snd_fm_port[dev], 4);
- if (snd_wss_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[2], snd_wss_port[dev],
+ if (port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], port[dev], 16);
+ if (fm_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[1], fm_port[dev], 4);
+ if (wss_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[2], wss_port[dev],
4);
- if (snd_dma1[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[0], snd_dma1[dev],
+ if (dma1[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[0], dma1[dev],
1);
- if (snd_dma2[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[1], snd_dma2[dev],
+ if (dma2[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[1], dma2[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) {
printk(KERN_ERR PFX "AUDIO isapnp configure failure\n");
return -EBUSY;
}
- snd_port[dev] = pdev->resource[0].start;
- snd_fm_port[dev] = pdev->resource[1].start;
- snd_wss_port[dev] = pdev->resource[2].start;
- snd_dma1[dev] = pdev->dma_resource[0].start;
- snd_dma2[dev] = pdev->dma_resource[1].start;
- snd_irq[dev] = pdev->irq_resource[0].start;
+ port[dev] = pdev->resource[0].start;
+ fm_port[dev] = pdev->resource[1].start;
+ wss_port[dev] = pdev->resource[2].start;
+ dma1[dev] = pdev->dma_resource[0].start;
+ dma2[dev] = pdev->dma_resource[1].start;
+ irq[dev] = pdev->irq_resource[0].start;
pdev = acard->devmpu;
if (pdev == NULL || pdev->prepare(pdev) < 0) {
- snd_mpu_port[dev] = -1;
+ mpu_port[dev] = -1;
return 0;
}
- if (snd_mpu_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_mpu_port[dev],
+ if (mpu_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], mpu_port[dev],
2);
- if (snd_mpu_irq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_mpu_irq[dev],
+ if (mpu_irq[dev] != SNDRV_AUTO_IRQ)
+ isapnp_resource_change(&pdev->irq_resource[0], mpu_irq[dev],
1);
if (pdev->activate(pdev) < 0) {
/* not fatal error */
printk(KERN_ERR PFX "MPU-401 isapnp configure failure\n");
- snd_mpu_port[dev] = -1;
+ mpu_port[dev] = -1;
acard->devmpu = NULL;
} else {
- snd_mpu_port[dev] = pdev->resource[0].start;
- snd_mpu_irq[dev] = pdev->irq_resource[0].start;
+ mpu_port[dev] = pdev->resource[0].start;
+ mpu_irq[dev] = pdev->irq_resource[0].start;
}
return 0;
@@ -284,7 +284,7 @@
cs4231_t *chip;
opl3_t *opl3;
- 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_azt2320))) == NULL)
return -ENOMEM;
acard = (struct snd_card_azt2320 *)card->private_data;
@@ -297,15 +297,15 @@
}
#endif /* __ISAPNP__ */
- if ((error = snd_card_azt2320_enable_wss(snd_port[dev]))) {
+ if ((error = snd_card_azt2320_enable_wss(port[dev]))) {
snd_card_free(card);
return error;
}
- if ((error = snd_cs4231_create(card, snd_wss_port[dev], -1,
- snd_irq[dev],
- snd_dma1[dev],
- snd_dma2[dev],
+ if ((error = snd_cs4231_create(card, wss_port[dev], -1,
+ irq[dev],
+ dma1[dev],
+ dma2[dev],
CS4231_HW_DETECT, 0, &chip)) < 0) {
snd_card_free(card);
return error;
@@ -324,21 +324,21 @@
return error;
}
- if (snd_mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0) {
if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,
- snd_mpu_port[dev], 0,
- snd_mpu_irq[dev], SA_INTERRUPT,
+ mpu_port[dev], 0,
+ mpu_irq[dev], SA_INTERRUPT,
NULL) < 0)
printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
- snd_mpu_port[dev]);
+ mpu_port[dev]);
}
- if (snd_fm_port[dev] > 0) {
+ if (fm_port[dev] > 0) {
if (snd_opl3_create(card,
- snd_fm_port[dev], snd_fm_port[dev] + 2,
+ fm_port[dev], fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &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 {
if ((error = snd_opl3_timer_new(opl3, 1, 2)) < 0) {
snd_card_free(card);
@@ -354,7 +354,7 @@
strcpy(card->driver, "AZT2320");
strcpy(card->shortname, "Aztech AZT2320");
sprintf(card->longname, "%s soundcard, WSS at 0x%lx, irq %i, dma %i&%i",
- card->shortname, chip->port, snd_irq[dev], snd_dma1[dev],
snd_dma2[dev]);
+ card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
if ((error = snd_card_register(card)) < 0) {
snd_card_free(card);
@@ -372,7 +372,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev])
+ if (!enable[dev])
continue;
snd_azt2320_isapnp_cards[dev] = card;
snd_azt2320_isapnp_id[dev] = id;
@@ -415,9 +415,9 @@
#ifndef MODULE
-/* format is: snd-azt2320=snd_enable,snd_index,snd_id,snd_port,
- snd_wss_port,snd_mpu_port,snd_fm_port,
- snd_irq,snd_mpu_irq,snd_dma1,snd_dma2 */
+/* format is: snd-azt2320=enable,index,id,port,
+ wss_port,mpu_port,fm_port,
+ irq,mpu_irq,dma1,dma2 */
static int __init alsa_card_azt2320_setup(char *str)
{
@@ -425,16 +425,16 @@
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,(int *)&snd_wss_port[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_mpu_port[nr_dev]) == 2 &&
- get_option(&str,&snd_irq[nr_dev]) == 2 &&
- get_option(&str,&snd_mpu_irq[nr_dev]) == 2 &&
- get_option(&str,&snd_dma1[nr_dev]) == 2 &&
- get_option(&str,&snd_dma2[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,(int *)&wss_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&mpu_port[nr_dev]) == 2 &&
+ get_option(&str,&irq[nr_dev]) == 2 &&
+ get_option(&str,&mpu_irq[nr_dev]) == 2 &&
+ get_option(&str,&dma1[nr_dev]) == 2 &&
+ get_option(&str,&dma2[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: cmi8330.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/cmi8330.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cmi8330.c 15 Sep 2002 09:14:23 -0000 1.11
+++ cmi8330.c 21 Oct 2002 18:28:21 -0000 1.12
@@ -30,8 +30,8 @@
*
* To quickly load the module,
*
- * modprobe -a snd-card-cmi8330 snd_sbport=0x220 snd_sbirq=5 snd_sbdma8=1
- * snd_sbdma16=5 snd_wssport=0x530 snd_wssirq=11 snd_wssdma=0
+ * modprobe -a snd-card-cmi8330 sbport=0x220 sbirq=5 sbdma8=1
+ * sbdma16=5 wssport=0x530 wssirq=11 wssdma=0
*
* This card has two mixers and two PCM devices. I've cheesed it such
* that recording and playback can be done through the same device.
@@ -63,57 +63,57 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{C-Media,CMI8330,isapnp:{CMI0001,@@@0001,@X@0001}}}");
-static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
-static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
-#ifdef __ISAPNP__
-static int snd_isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
-#endif
-static long snd_sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
-static int snd_sbirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
-static int snd_sbdma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
-static int snd_sbdma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
-static long snd_wssport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
-static int snd_wssirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
-static int snd_wssdma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for CMI8330 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 CMI8330 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 CMI8330 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_sbport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_sbport, "Port # for CMI8330 SB driver.");
-MODULE_PARM_SYNTAX(snd_sbport, SNDRV_ENABLED
",allows:{{0x220,0x280,0x20}},prefers:{0x220},base:16,dialog:list");
-MODULE_PARM(snd_sbirq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_sbirq, "IRQ # for CMI8330 SB driver.");
-MODULE_PARM_SYNTAX(snd_sbirq, SNDRV_ENABLED
",allows:{{5},{7},{9},{10},{11},{12}},prefers:{5},dialog:list");
-MODULE_PARM(snd_sbdma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_sbdma8, "DMA8 for CMI8330 SB driver.");
-MODULE_PARM_SYNTAX(snd_sbdma8, SNDRV_DMA8_DESC ",prefers:{1}");
-MODULE_PARM(snd_sbdma16, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_sbdma16, "DMA16 for CMI8330 SB driver.");
-MODULE_PARM_SYNTAX(snd_sbdma16, SNDRV_ENABLED
",allows:{{5},{7}},prefers:{5},dialog:list");
-
-MODULE_PARM(snd_wssport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_wssport, "Port # for CMI8330 WSS driver.");
-MODULE_PARM_SYNTAX(snd_wssport, SNDRV_ENABLED
",allows:{{0x530},{0xe80,0xf40,0xc0}},prefers:{0x530},base:16,dialog:list");
-MODULE_PARM(snd_wssirq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_wssirq, "IRQ # for CMI8330 WSS driver.");
-MODULE_PARM_SYNTAX(snd_wssirq, SNDRV_ENABLED
",allows:{{5},{7},{9},{10},{11},{12}},prefers:{11},dialog:list");
-MODULE_PARM(snd_wssdma, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_wssdma, "DMA for CMI8330 WSS driver.");
-MODULE_PARM_SYNTAX(snd_wssdma, SNDRV_DMA8_DESC ",prefers:{0}");
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
+#ifdef __ISAPNP__
+static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+#endif
+static long sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static int sbirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
+static int sbdma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+static int sbdma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+static long wssport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static int wssirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
+static int wssdma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for CMI8330 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for CMI8330 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable CMI8330 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(sbport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(sbport, "Port # for CMI8330 SB driver.");
+MODULE_PARM_SYNTAX(sbport, SNDRV_ENABLED
+",allows:{{0x220,0x280,0x20}},prefers:{0x220},base:16,dialog:list");
+MODULE_PARM(sbirq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330 SB driver.");
+MODULE_PARM_SYNTAX(sbirq, SNDRV_ENABLED
+",allows:{{5},{7},{9},{10},{11},{12}},prefers:{5},dialog:list");
+MODULE_PARM(sbdma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330 SB driver.");
+MODULE_PARM_SYNTAX(sbdma8, SNDRV_DMA8_DESC ",prefers:{1}");
+MODULE_PARM(sbdma16, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330 SB driver.");
+MODULE_PARM_SYNTAX(sbdma16, SNDRV_ENABLED
+",allows:{{5},{7}},prefers:{5},dialog:list");
+
+MODULE_PARM(wssport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(wssport, "Port # for CMI8330 WSS driver.");
+MODULE_PARM_SYNTAX(wssport, SNDRV_ENABLED
+",allows:{{0x530},{0xe80,0xf40,0xc0}},prefers:{0x530},base:16,dialog:list");
+MODULE_PARM(wssirq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330 WSS driver.");
+MODULE_PARM_SYNTAX(wssirq, SNDRV_ENABLED
+",allows:{{5},{7},{9},{10},{11},{12}},prefers:{11},dialog:list");
+MODULE_PARM(wssdma, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(wssdma, "DMA for CMI8330 WSS driver.");
+MODULE_PARM_SYNTAX(wssdma, SNDRV_DMA8_DESC ",prefers:{0}");
#define CMI8330_RMUX3D 16
#define CMI8330_MUTEMUX 17
@@ -238,20 +238,20 @@
if (pdev->prepare(pdev)<0)
return -EAGAIN;
/* allocate AD1848 resources */
- if (snd_wssport[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_wssport[dev], 8);
- if (snd_wssdma[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[0], snd_wssdma[dev], 1);
- if (snd_wssirq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_wssirq[dev], 1);
+ if (wssport[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], wssport[dev], 8);
+ if (wssdma[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[0], wssdma[dev], 1);
+ if (wssirq[dev] != SNDRV_AUTO_IRQ)
+ isapnp_resource_change(&pdev->irq_resource[0], wssirq[dev], 1);
if (pdev->activate(pdev)<0) {
snd_printk("(AD1848) PnP configure failure\n");
return -EBUSY;
}
- snd_wssport[dev] = pdev->resource[0].start;
- snd_wssdma[dev] = pdev->dma_resource[0].start;
- snd_wssirq[dev] = pdev->irq_resource[0].start;
+ wssport[dev] = pdev->resource[0].start;
+ wssdma[dev] = pdev->dma_resource[0].start;
+ wssirq[dev] = pdev->irq_resource[0].start;
/* allocate SB16 resources */
pdev = acard->play;
@@ -259,24 +259,24 @@
acard->cap->deactivate(acard->cap);
return -EAGAIN;
}
- if (snd_sbport[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_sbport[dev], 16);
- if (snd_sbdma8[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[0], snd_sbdma8[dev], 1);
- if (snd_sbdma16[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[1], snd_sbdma16[dev], 1);
- if (snd_sbirq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_sbirq[dev], 1);
+ if (sbport[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], sbport[dev], 16);
+ if (sbdma8[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[0], sbdma8[dev], 1);
+ if (sbdma16[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[1], sbdma16[dev], 1);
+ if (sbirq[dev] != SNDRV_AUTO_IRQ)
+ isapnp_resource_change(&pdev->irq_resource[0], sbirq[dev], 1);
if (pdev->activate(pdev)<0) {
snd_printk("CMI8330/C3D (SB16) PnP configure failure\n");
acard->cap->deactivate(acard->cap);
return -EBUSY;
}
- snd_sbport[dev] = pdev->resource[0].start;
- snd_sbdma8[dev] = pdev->dma_resource[0].start;
- snd_sbdma16[dev] = pdev->dma_resource[1].start;
- snd_sbirq[dev] = pdev->irq_resource[0].start;
+ sbport[dev] = pdev->resource[0].start;
+ sbdma8[dev] = pdev->dma_resource[0].start;
+ sbdma16[dev] = pdev->dma_resource[1].start;
+ sbirq[dev] = pdev->irq_resource[0].start;
return 0;
}
@@ -317,20 +317,20 @@
snd_pcm_str_t *pstr;
#ifdef __ISAPNP__
- if (!snd_isapnp[dev]) {
+ if (!isapnp[dev]) {
#endif
- if (snd_wssport[dev] == SNDRV_AUTO_PORT) {
- snd_printk("specify snd_wssport\n");
+ if (wssport[dev] == SNDRV_AUTO_PORT) {
+ snd_printk("specify wssport\n");
return -EINVAL;
}
- if (snd_sbport[dev] == SNDRV_AUTO_PORT) {
- snd_printk("specify snd_sbport\n");
+ if (sbport[dev] == SNDRV_AUTO_PORT) {
+ snd_printk("specify sbport\n");
return -EINVAL;
}
#ifdef __ISAPNP__
}
#endif
- 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_cmi8330));
if (card == NULL) {
snd_printk("could not get a new card\n");
@@ -340,7 +340,7 @@
card->private_free = snd_cmi8330_free;
#ifdef __ISAPNP__
- if (snd_isapnp[dev] && (err = snd_cmi8330_isapnp(dev, acard)) < 0) {
+ if (isapnp[dev] && (err = snd_cmi8330_isapnp(dev, acard)) < 0) {
snd_printk("PnP detection failed\n");
snd_card_free(card);
return err;
@@ -348,9 +348,9 @@
#endif
if ((err = snd_ad1848_create(card,
- snd_wssport[dev] + 4,
- snd_wssirq[dev],
- snd_wssdma[dev],
+ wssport[dev] + 4,
+ wssirq[dev],
+ wssdma[dev],
AD1848_HW_DETECT,
&chip_wss)) < 0) {
snd_printk("(AD1848) device busy??\n");
@@ -368,11 +368,11 @@
return err;
}
- if ((err = snd_sbdsp_create(card, snd_sbport[dev],
- snd_sbirq[dev],
+ if ((err = snd_sbdsp_create(card, sbport[dev],
+ sbirq[dev],
snd_sb16dsp_interrupt,
- snd_sbdma8[dev],
- snd_sbdma16[dev],
+ sbdma8[dev],
+ sbdma16[dev],
SB_HW_AUTO, &chip_sb)) < 0) {
snd_printk("(SB16) device busy??\n");
snd_card_free(card);
@@ -429,8 +429,8 @@
sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
wss_pcm->name,
chip_wss->port,
- snd_wssirq[dev],
- snd_wssdma[dev]);
+ wssirq[dev],
+ wssdma[dev]);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
@@ -457,7 +457,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev] || !snd_isapnp[dev])
+ if (!enable[dev] || !isapnp[dev])
continue;
snd_cmi8330_isapnp_cards[dev] = card;
snd_cmi8330_isapnp_id[dev] = id;
@@ -476,10 +476,10 @@
int dev, cards = 0;
for (dev = 0; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev])
+ if (!enable[dev])
continue;
#ifdef __ISAPNP__
- if (snd_isapnp[dev])
+ if (isapnp[dev])
continue;
#endif
if (snd_cmi8330_probe(dev) >= 0)
@@ -503,11 +503,11 @@
#ifndef MODULE
-/* format is: snd-cmi8330=snd_enable,snd_index,snd_id,snd_isapnp,
- snd_sbport,snd_sbirq,
- snd_sbdma8,snd_sbdma16,
- snd_wssport,snd_wssirq,
- snd_wssdma */
+/* format is: snd-cmi8330=enable,index,id,isapnp,
+ sbport,sbirq,
+ sbdma8,sbdma16,
+ wssport,wssirq,
+ wssdma */
static int __init alsa_card_cmi8330_setup(char *str)
{
@@ -516,20 +516,20 @@
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_sbport[nr_dev]) == 2 &&
- get_option(&str,&snd_sbirq[nr_dev]) == 2 &&
- get_option(&str,&snd_sbdma8[nr_dev]) == 2 &&
- get_option(&str,&snd_sbdma16[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_wssport[nr_dev]) == 2 &&
- get_option(&str,&snd_wssirq[nr_dev]) == 2 &&
- get_option(&str,&snd_wssdma[nr_dev]) == 2);
+ get_option(&str,(int *)&sbport[nr_dev]) == 2 &&
+ get_option(&str,&sbirq[nr_dev]) == 2 &&
+ get_option(&str,&sbdma8[nr_dev]) == 2 &&
+ get_option(&str,&sbdma16[nr_dev]) == 2 &&
+ get_option(&str,(int *)&wssport[nr_dev]) == 2 &&
+ get_option(&str,&wssirq[nr_dev]) == 2 &&
+ get_option(&str,&wssdma[nr_dev]) == 2);
#ifdef __ISAPNP__
if (pnp != INT_MAX)
- snd_isapnp[nr_dev] = pnp;
+ isapnp[nr_dev] = pnp;
#endif
nr_dev++;
return 1;
Index: dt019x.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dt019x.c 13 Aug 2002 16:13:37 -0000 1.3
+++ dt019x.c 21 Oct 2002 18:28:21 -0000 1.4
@@ -48,43 +48,43 @@
MODULE_DEVICES("{{Diamond Technologies DT-019X},"
"{Avance Logic ALS-007}}");
-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; /* PnP setup */
-static long snd_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* PnP setup */
-static int snd_mpu_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 DT-019X 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 DT-019X 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 DT-019X 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 dt019x driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port # for dt019x driver.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_fm_port, "FM port # for dt019x driver.");
-MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for dt019x driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_mpu_irq, "MPU-401 IRQ # for dt019x driver.");
-MODULE_PARM_SYNTAX(snd_mpu_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma8, "8-bit DMA # for dt019x 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; /* PnP setup */
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* PnP setup */
+static int mpu_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 DT-019X 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 DT-019X based soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable DT-019X based soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for dt019x driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for dt019x driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_PORT12_DESC);
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port # for dt019x driver.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_PORT12_DESC);
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for dt019x driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for dt019x driver.");
+MODULE_PARM_SYNTAX(mpu_irq, SNDRV_IRQ_DESC);
+MODULE_PARM(dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma8, "8-bit DMA # for dt019x driver.");
+MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC);
struct snd_card_dt019x {
#ifdef __ISAPNP__
@@ -152,60 +152,60 @@
if (!pdev || 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) {
printk(KERN_ERR PFX "DT-019X 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;
snd_printdd("dt019x: found audio interface: port=0x%lx, irq=0x%lx,
dma=0x%lx\n",
- snd_port[dev],snd_irq[dev],snd_dma8[dev]);
+ port[dev],irq[dev],dma8[dev]);
pdev = acard->devmpu;
if (!pdev || pdev->prepare(pdev)<0)
return 0;
- if (snd_mpu_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_mpu_port[dev],
+ if (mpu_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], mpu_port[dev],
2);
- if (snd_mpu_irq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_mpu_irq[dev],
+ if (mpu_irq[dev] != SNDRV_AUTO_IRQ)
+ isapnp_resource_change(&pdev->irq_resource[0], mpu_irq[dev],
1);
if (pdev->activate(pdev)<0) {
printk(KERN_ERR PFX "DT-019X MPU-401 isapnp configure failure\n");
- snd_mpu_port[dev] = -1;
+ mpu_port[dev] = -1;
acard->devmpu = NULL;
} else {
- snd_mpu_port[dev] = pdev->resource[0].start;
- snd_mpu_irq[dev] = pdev->irq_resource[0].start;
+ mpu_port[dev] = pdev->resource[0].start;
+ mpu_irq[dev] = pdev->irq_resource[0].start;
snd_printdd("dt019x: found MPU-401: port=0x%lx, irq=0x%lx\n",
- snd_mpu_port[dev],snd_mpu_irq[dev]);
+ mpu_port[dev],mpu_irq[dev]);
}
pdev = acard->devopl;
if (!pdev || pdev->prepare(pdev)<0)
return 0;
- if (snd_fm_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_fm_port[dev], 4);
+ if (fm_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], fm_port[dev], 4);
if (pdev->activate(pdev)<0) {
printk(KERN_ERR PFX "DT-019X OPL3 isapnp configure failure\n");
- snd_fm_port[dev] = -1;
+ fm_port[dev] = -1;
acard->devopl = NULL;
} else {
- snd_fm_port[dev] = pdev->resource[0].start;
- snd_printdd("dt019x: found OPL3 synth: port=0x%lx\n",snd_fm_port[dev]);
+ fm_port[dev] = pdev->resource[0].start;
+ snd_printdd("dt019x: found OPL3 synth: port=0x%lx\n",fm_port[dev]);
}
return 0;
@@ -247,7 +247,7 @@
struct snd_card_dt019x *acard;
opl3_t *opl3;
- 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_dt019x))) == NULL)
return -ENOMEM;
acard = (struct snd_card_dt019x *)card->private_data;
@@ -264,10 +264,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_sb16dsp_interrupt,
- snd_dma8[dev],
+ dma8[dev],
-1,
SB_HW_DT019X,
&chip)) < 0) {
@@ -284,25 +284,25 @@
return error;
}
- if (snd_mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0) {
if (snd_mpu401_uart_new(card, 0,
/* MPU401_HW_SB,*/
MPU401_HW_MPU401,
- snd_mpu_port[dev], 0,
- snd_mpu_irq[dev],
+ mpu_port[dev], 0,
+ mpu_irq[dev],
SA_INTERRUPT,
NULL) < 0)
printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n",
- snd_mpu_port[dev]);
+ mpu_port[dev]);
}
- if (snd_fm_port[dev] > 0) {
+ if (fm_port[dev] > 0) {
if (snd_opl3_create(card,
- snd_fm_port[dev],
- snd_fm_port[dev] + 2,
+ fm_port[dev],
+ fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &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 {
if ((error = snd_opl3_timer_new(opl3, 0, 1)) < 0) {
snd_card_free(card);
@@ -319,7 +319,7 @@
strcpy(card->shortname, "Diamond Tech. DT-019X");
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]);
+ irq[dev], dma8[dev]);
if ((error = snd_card_register(card)) < 0) {
snd_card_free(card);
return error;
@@ -336,7 +336,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev])
+ if (!enable[dev])
continue;
snd_dt019x_isapnp_cards[dev] = card;
snd_dt019x_isapnp_id[dev] = id;
@@ -379,9 +379,9 @@
#ifndef MODULE
-/* format is: snd-dt019x=snd_enable,snd_index,snd_id,snd_isapnp,
- snd_port,snd_mpu_port,snd_fm_port,
- snd_irq,snd_mpu_irq,snd_dma8,snd_dma8_size */
+/* format is: snd-dt019x=enable,index,id,snd_isapnp,
+ port,mpu_port,fm_port,
+ irq,mpu_irq,dma8,dma8_size */
static int __init alsa_card_dt019x_setup(char *str)
{
@@ -389,15 +389,15 @@
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,(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_mpu_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,(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,&mpu_irq[nr_dev]) == 2 &&
+ get_option(&str,&dma8[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: es18xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- es18xx.c 14 Oct 2002 10:10:58 -0000 1.19
+++ es18xx.c 21 Oct 2002 18:28:21 -0000 1.20
@@ -1897,55 +1897,55 @@
"{ESS,ES1887 AudioDrive},"
"{ESS,ES1888 AudioDrive}}");
-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 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 snd_isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
#endif
-static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /*
0x220,0x240,0x260,0x280 */
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260,0x280 */
#ifndef __ISAPNP__
-static long snd_mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
+static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
#else
-static long snd_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
#endif
-static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
-static int snd_dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
-static int snd_dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for ES18xx 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 ES18xx 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 ES18xx 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 ES18xx driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED
",allows:{{0x220,0x280,0x20}},prefers:{0x220},base:16,dialog:list");
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port # for ES18xx driver.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_ENABLED
",allows:{{0x300,0x330,0x30},{0x800,0xffe,0x2}},prefers:{0x330,0x300},base:16,dialog:combo");
-MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_fm_port, "FM port # for ES18xx driver.");
-MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_ENABLED
",allows:{{0x388},{0x800,0xffc,0x4}},prefers:{0x388},base:16,dialog:combo");
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for ES18xx driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC ",prefers:{5}");
-MODULE_PARM(snd_dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma1, "DMA 1 # for ES18xx driver.");
-MODULE_PARM_SYNTAX(snd_dma1, SNDRV_DMA8_DESC ",prefers:{1}");
-MODULE_PARM(snd_dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma2, "DMA 2 # for ES18xx driver.");
-MODULE_PARM_SYNTAX(snd_dma2, SNDRV_ENABLED
",allows:{{0},{1},{3},{5}},dialog:list,prefers:{0}");
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
+static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for ES18xx soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for ES18xx soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable ES18xx 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 ES18xx driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED
+",allows:{{0x220,0x280,0x20}},prefers:{0x220},base:16,dialog:list");
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for ES18xx driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED
+",allows:{{0x300,0x330,0x30},{0x800,0xffe,0x2}},prefers:{0x330,0x300},base:16,dialog:combo");
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port # for ES18xx driver.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED
+",allows:{{0x388},{0x800,0xffc,0x4}},prefers:{0x388},base:16,dialog:combo");
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for ES18xx driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC ",prefers:{5}");
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "DMA 1 # for ES18xx driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_DMA8_DESC ",prefers:{1}");
+MODULE_PARM(dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma2, "DMA 2 # for ES18xx driver.");
+MODULE_PARM_SYNTAX(dma2, SNDRV_ENABLED
+",allows:{{0},{1},{3},{5}},dialog:list,prefers:{0}");
struct snd_audiodrive {
#ifdef __ISAPNP__
@@ -2019,18 +2019,18 @@
acard->devc->deactivate(acard->devc);
return -EAGAIN;
}
- if (snd_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_port[dev], 16);
- if (snd_fm_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[1], snd_fm_port[dev], 4);
- if (snd_mpu_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[2], snd_mpu_port[dev], 2);
- if (snd_dma1[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[0], snd_dma1[dev], 1);
- if (snd_dma2[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[1], snd_dma2[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 (fm_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[1], fm_port[dev], 4);
+ if (mpu_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[2], mpu_port[dev], 2);
+ if (dma1[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[0], dma1[dev], 1);
+ if (dma2[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[1], dma2[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");
acard->devc->deactivate(acard->devc);
@@ -2040,18 +2040,18 @@
/* skip csn and logdev initialization - already done in isapnp_configure */
isapnp_cfg_begin(pdev->bus->number, pdev->devfn);
isapnp_write_byte(0x27, pdev->irq_resource[0].start); /* Hardware Volume IRQ
Number */
- if (snd_mpu_port[dev] != SNDRV_AUTO_PORT)
+ if (mpu_port[dev] != SNDRV_AUTO_PORT)
isapnp_write_byte(0x28, pdev->irq); /* MPU-401 IRQ Number
*/
isapnp_write_byte(0x72, pdev->irq_resource[0].start); /* second IRQ */
isapnp_cfg_end();
- snd_port[dev] = pdev->resource[0].start;
- snd_fm_port[dev] = pdev->resource[1].start;
- snd_mpu_port[dev] = pdev->resource[2].start;
- snd_dma1[dev] = pdev->dma_resource[0].start;
- snd_dma2[dev] = pdev->dma_resource[1].start;
- snd_irq[dev] = pdev->irq_resource[0].start;
- snd_printdd("isapnp ES18xx: port=0x%lx, fm port=0x%lx, mpu port=0x%lx\n",
snd_port[dev], snd_fm_port[dev], snd_mpu_port[dev]);
- snd_printdd("isapnp ES18xx: dma1=%i, dma2=%i, irq=%i\n", snd_dma1[dev],
snd_dma2[dev], snd_irq[dev]);
+ port[dev] = pdev->resource[0].start;
+ fm_port[dev] = pdev->resource[1].start;
+ mpu_port[dev] = pdev->resource[2].start;
+ dma1[dev] = pdev->dma_resource[0].start;
+ dma2[dev] = pdev->dma_resource[1].start;
+ irq[dev] = pdev->irq_resource[0].start;
+ snd_printdd("isapnp ES18xx: port=0x%lx, fm port=0x%lx, mpu port=0x%lx\n",
+port[dev], fm_port[dev], mpu_port[dev]);
+ snd_printdd("isapnp ES18xx: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev],
+irq[dev]);
return 0;
}
@@ -2083,7 +2083,7 @@
{
static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
static int possible_dmas[] = {1, 0, 3, 5, -1};
- int irq, dma1, dma2;
+ int xirq, xdma1, xdma2;
snd_card_t *card;
struct snd_audiodrive *acard;
snd_rawmidi_t *rmidi = NULL;
@@ -2091,38 +2091,38 @@
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_audiodrive));
if (card == NULL)
return -ENOMEM;
acard = (struct snd_audiodrive *)card->private_data;
card->private_free = snd_audiodrive_free;
#ifdef __ISAPNP__
- if (snd_isapnp[dev] && (err = snd_audiodrive_isapnp(dev, acard)) < 0) {
+ if (isapnp[dev] && (err = snd_audiodrive_isapnp(dev, acard)) < 0) {
snd_card_free(card);
return err;
}
#endif
- irq = snd_irq[dev];
- if (irq == SNDRV_AUTO_IRQ) {
- if ((irq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
+ xirq = irq[dev];
+ if (xirq == SNDRV_AUTO_IRQ) {
+ if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free IRQ\n");
return -EBUSY;
}
}
- dma1 = snd_dma1[dev];
- if (dma1 == SNDRV_AUTO_DMA) {
- if ((dma1 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
+ xdma1 = dma1[dev];
+ if (xdma1 == SNDRV_AUTO_DMA) {
+ if ((xdma1 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free DMA1\n");
return -EBUSY;
}
}
- dma2 = snd_dma2[dev];
- if (dma2 == SNDRV_AUTO_DMA) {
- if ((dma2 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
+ xdma2 = dma2[dev];
+ if (xdma2 == SNDRV_AUTO_DMA) {
+ if ((xdma2 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free DMA2\n");
return -EBUSY;
@@ -2130,10 +2130,10 @@
}
if ((err = snd_es18xx_new_device(card,
- snd_port[dev],
- snd_mpu_port[dev],
- snd_fm_port[dev],
- irq, dma1, dma2,
+ port[dev],
+ mpu_port[dev],
+ fm_port[dev],
+ xirq, xdma1, xdma2,
&chip)) < 0) {
snd_card_free(card);
return err;
@@ -2147,7 +2147,7 @@
return err;
}
- if (snd_fm_port[dev] > 0 && snd_fm_port[dev] != SNDRV_AUTO_PORT) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card, chip->fm_port, chip->fm_port + 2,
OPL3_HW_OPL3, 0, &opl3) < 0) {
printk(KERN_ERR PFX "opl3 not detected at 0x%lx\n",
chip->fm_port);
} else {
@@ -2158,10 +2158,10 @@
}
}
- if (snd_mpu_port[dev] > 0 && snd_mpu_port[dev] != SNDRV_AUTO_PORT) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
chip->mpu_port, 0,
- irq, 0,
+ xirq, 0,
&rmidi)) < 0) {
snd_card_free(card);
return err;
@@ -2184,7 +2184,7 @@
sprintf(card->longname, "%s at 0x%lx, irq %d, dma1 %d, dma2 %d",
card->shortname,
chip->port,
- irq, dma1, dma2);
+ xirq, xdma1, xdma2);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
return err;
@@ -2193,22 +2193,22 @@
return 0;
}
-static int __init snd_audiodrive_probe_legacy_port(unsigned long port)
+static int __init snd_audiodrive_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_audiodrive_probe(dev);
if (res < 0)
- snd_port[dev] = SNDRV_AUTO_PORT;
+ port[dev] = SNDRV_AUTO_PORT;
return res;
}
return -ENODEV;
@@ -2223,7 +2223,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev] || !snd_isapnp[dev])
+ if (!enable[dev] || !isapnp[dev])
continue;
snd_audiodrive_isapnp_cards[dev] = card;
snd_audiodrive_isapnp_id[dev] = id;
@@ -2245,10 +2245,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_audiodrive_probe(dev) >= 0)
@@ -2282,9 +2282,9 @@
#ifndef MODULE
-/* format is: snd-es18xx=snd_enable,snd_index,snd_id,snd_isapnp,
- snd_port,snd_mpu_port,snd_fm_port,snd_irq,
- snd_dma1,snd_dma2 */
+/* format is: snd-es18xx=enable,index,id,isapnp,
+ port,mpu_port,fm_port,irq,
+ dma1,dma2 */
static int __init alsa_card_es18xx_setup(char *str)
{
@@ -2293,19 +2293,19 @@
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_dma1[nr_dev]) == 2 &&
- get_option(&str,&snd_dma2[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,&dma1[nr_dev]) == 2 &&
+ get_option(&str,&dma2[nr_dev]) == 2);
#ifdef __ISAPNP__
if (pnp != INT_MAX)
- snd_isapnp[nr_dev] = pnp;
+ isapnp[nr_dev] = pnp;
#endif
nr_dev++;
return 1;
Index: opl3sa2.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- opl3sa2.c 13 Aug 2002 16:13:37 -0000 1.16
+++ opl3sa2.c 21 Oct 2002 18:28:21 -0000 1.17
@@ -46,63 +46,63 @@
"{Intel,AL440LX sound},"
"{NeoMagic,MagicWave 3DX}}");
-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; /* 0xf86,0x370,0x100 */
-static long snd_sb_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260 */
-static long snd_wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* 0x530,0xe80,0xf40,0x604
*/
-static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x388 */
-static long snd_midi_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* 0x330,0x300 */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 0,1,3,5,9,11,12,15 */
-static int snd_dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3,5,6,7 */
-static int snd_dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3,5,6,7 */
-static int snd_opl3sa3_ymode[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 0 }; /*
0,1,2,3 */ /*SL Added*/
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for OPL3-SA 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 OPL3-SA 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 OPL3-SA 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 OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED
",allows:{{0xf86},{0x370},{0x100}},dialog:list");
-MODULE_PARM(snd_sb_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_sb_port, "SB port # for OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_sb_port, SNDRV_ENABLED
",allows:{{0x220},{0x240},{0x260}},dialog:list");
-MODULE_PARM(snd_wss_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_wss_port, "WSS port # for OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_wss_port, SNDRV_ENABLED
",allows:{{0x530},{0xe80},{0xf40},{0x604}},dialog:list");
-MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_fm_port, "FM port # for OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_ENABLED ",allows:{{0x388}},dialog:list");
-MODULE_PARM(snd_midi_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_midi_port, "MIDI port # for OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_midi_port, SNDRV_ENABLED
",allows:{{0x330},{0x300}},dialog:list");
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_ENABLED
",allows:{{0},{1},{3},{5},{9},{11},{12},{15}},dialog:list");
-MODULE_PARM(snd_dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma1, "DMA1 # for OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_dma1, SNDRV_ENABLED
",allows:{{1},{3},{5},{6},{7}},dialog:list");
-MODULE_PARM(snd_dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma2, "DMA2 # for OPL3-SA driver.");
-MODULE_PARM_SYNTAX(snd_dma2, SNDRV_ENABLED
",allows:{{1},{3},{5},{6},{7}},dialog:list");
-MODULE_PARM(snd_opl3sa3_ymode, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); /* SL Added */
-MODULE_PARM_DESC(snd_opl3sa3_ymode, "Speaker size selection for 3D Enhancement mode:
Desktop/Large Notebook/Small Notebook/HiFi.");
-MODULE_PARM_SYNTAX(snd_opl3sa3_ymode, SNDRV_ENABLED ",allows:{{0,3}},dialog:list");
/* SL Added */
+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; /* 0xf86,0x370,0x100 */
+static long sb_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260 */
+static long wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* 0x530,0xe80,0xf40,0x604 */
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x388 */
+static long midi_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* 0x330,0x300 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 0,1,3,5,9,11,12,15 */
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3,5,6,7 */
+static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 1,3,5,6,7 */
+static int opl3sa3_ymode[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 0 }; /* 0,1,2,3
+*/ /*SL Added*/
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for OPL3-SA soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for OPL3-SA soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable OPL3-SA 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 OPL3-SA driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED
+",allows:{{0xf86},{0x370},{0x100}},dialog:list");
+MODULE_PARM(sb_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(sb_port, "SB port # for OPL3-SA driver.");
+MODULE_PARM_SYNTAX(sb_port, SNDRV_ENABLED
+",allows:{{0x220},{0x240},{0x260}},dialog:list");
+MODULE_PARM(wss_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(wss_port, "WSS port # for OPL3-SA driver.");
+MODULE_PARM_SYNTAX(wss_port, SNDRV_ENABLED
+",allows:{{0x530},{0xe80},{0xf40},{0x604}},dialog:list");
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port # for OPL3-SA driver.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED ",allows:{{0x388}},dialog:list");
+MODULE_PARM(midi_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(midi_port, "MIDI port # for OPL3-SA driver.");
+MODULE_PARM_SYNTAX(midi_port, SNDRV_ENABLED ",allows:{{0x330},{0x300}},dialog:list");
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for OPL3-SA driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_ENABLED
+",allows:{{0},{1},{3},{5},{9},{11},{12},{15}},dialog:list");
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "DMA1 # for OPL3-SA driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_ENABLED ",allows:{{1},{3},{5},{6},{7}},dialog:list");
+MODULE_PARM(dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma2, "DMA2 # for OPL3-SA driver.");
+MODULE_PARM_SYNTAX(dma2, SNDRV_ENABLED ",allows:{{1},{3},{5},{6},{7}},dialog:list");
+MODULE_PARM(opl3sa3_ymode, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); /* SL Added */
+MODULE_PARM_DESC(opl3sa3_ymode, "Speaker size selection for 3D Enhancement mode:
+Desktop/Large Notebook/Small Notebook/HiFi.");
+MODULE_PARM_SYNTAX(opl3sa3_ymode, SNDRV_ENABLED ",allows:{{0,3}},dialog:list"); /*
+SL Added */
/* control ports */
#define OPL3SA2_PM_CTRL 0x01
@@ -648,38 +648,38 @@
pdev = chip->dev;
if (pdev->prepare(pdev)<0)
return -EAGAIN;
- if (snd_sb_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_sb_port[dev], 16);
- if (snd_wss_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[1], snd_wss_port[dev], 8);
- if (snd_fm_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[2], snd_fm_port[dev], 4);
- if (snd_midi_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[3], snd_midi_port[dev], 2);
- if (snd_port[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[4], snd_port[dev], 2);
- if (snd_dma1[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[0], snd_dma1[dev], 1);
- if (snd_dma2[dev] != SNDRV_AUTO_DMA)
- isapnp_resource_change(&pdev->dma_resource[1], snd_dma2[dev], 1);
- if (snd_irq[dev] != SNDRV_AUTO_IRQ)
- isapnp_resource_change(&pdev->irq_resource[0], snd_irq[dev], 1);
+ if (sb_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], sb_port[dev], 16);
+ if (wss_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[1], wss_port[dev], 8);
+ if (fm_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[2], fm_port[dev], 4);
+ if (midi_port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[3], midi_port[dev], 2);
+ if (port[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[4], port[dev], 2);
+ if (dma1[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[0], dma1[dev], 1);
+ if (dma2[dev] != SNDRV_AUTO_DMA)
+ isapnp_resource_change(&pdev->dma_resource[1], dma2[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("isapnp configure failure (out of resources?)\n");
return -EBUSY;
}
- snd_sb_port[dev] = pdev->resource[0].start;
- snd_wss_port[dev] = pdev->resource[1].start;
- snd_fm_port[dev] = pdev->resource[2].start;
- snd_midi_port[dev] = pdev->resource[3].start;
- snd_port[dev] = pdev->resource[4].start;
- snd_dma1[dev] = pdev->dma_resource[0].start;
- snd_dma2[dev] = pdev->dma_resource[1].start;
- snd_irq[dev] = pdev->irq_resource[0].start;
+ sb_port[dev] = pdev->resource[0].start;
+ wss_port[dev] = pdev->resource[1].start;
+ fm_port[dev] = pdev->resource[2].start;
+ midi_port[dev] = pdev->resource[3].start;
+ port[dev] = pdev->resource[4].start;
+ dma1[dev] = pdev->dma_resource[0].start;
+ dma2[dev] = pdev->dma_resource[1].start;
+ irq[dev] = pdev->irq_resource[0].start;
snd_printdd("isapnp OPL3-SA: sb port=0x%lx, wss port=0x%lx, fm port=0x%lx,
midi port=0x%lx\n",
- snd_sb_port[dev], snd_wss_port[dev], snd_fm_port[dev],
snd_midi_port[dev]);
+ sb_port[dev], wss_port[dev], fm_port[dev], midi_port[dev]);
snd_printdd("isapnp OPL3-SA: control port=0x%lx, dma1=%i, dma2=%i, irq=%i\n",
- snd_port[dev], snd_dma1[dev], snd_dma2[dev], snd_irq[dev]);
+ port[dev], dma1[dev], dma2[dev], irq[dev]);
return 0;
}
@@ -719,7 +719,7 @@
static int __init snd_opl3sa2_probe(int dev)
{
- int irq, dma1, dma2;
+ int xirq, xdma1, xdma2;
snd_card_t *card;
struct snd_opl3sa2 *chip;
cs4231_t *cs4231;
@@ -730,28 +730,28 @@
int err;
#ifdef __ISAPNP__
- if (!snd_isapnp[dev]) {
+ if (!isapnp[dev]) {
#endif
- if (snd_port[dev] == SNDRV_AUTO_PORT) {
- snd_printk("specify snd_port\n");
+ if (port[dev] == SNDRV_AUTO_PORT) {
+ snd_printk("specify port\n");
return -EINVAL;
}
- if (snd_wss_port[dev] == SNDRV_AUTO_PORT) {
- snd_printk("specify snd_wss_port\n");
+ if (wss_port[dev] == SNDRV_AUTO_PORT) {
+ snd_printk("specify wss_port\n");
return -EINVAL;
}
- if (snd_fm_port[dev] == SNDRV_AUTO_PORT) {
- snd_printk("specify snd_fm_port\n");
+ if (fm_port[dev] == SNDRV_AUTO_PORT) {
+ snd_printk("specify fm_port\n");
return -EINVAL;
}
- if (snd_midi_port[dev] == SNDRV_AUTO_PORT) {
- snd_printk("specify snd_midi_port\n");
+ if (midi_port[dev] == SNDRV_AUTO_PORT) {
+ snd_printk("specify midi_port\n");
return -EINVAL;
}
#ifdef __ISAPNP__
}
#endif
- card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE, 0);
+ card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
strcpy(card->driver, "OPL3SA2");
@@ -765,31 +765,31 @@
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
goto __error;
#ifdef __ISAPNP__
- if (snd_isapnp[dev] && (err = snd_opl3sa2_isapnp(dev, chip)) < 0)
+ if (isapnp[dev] && (err = snd_opl3sa2_isapnp(dev, chip)) < 0)
goto __error;
#endif
- chip->ymode = snd_opl3sa3_ymode[dev] & 0x03 ; /* initialise this card from
supplied (or default) parameter*/
+ chip->ymode = opl3sa3_ymode[dev] & 0x03 ; /* initialise this card from
+supplied (or default) parameter*/
chip->card = card;
- chip->port = snd_port[dev];
- irq = snd_irq[dev];
- dma1 = snd_dma1[dev];
- dma2 = snd_dma2[dev];
- if (dma2 < 0)
+ chip->port = port[dev];
+ xirq = irq[dev];
+ xdma1 = dma1[dev];
+ xdma2 = dma2[dev];
+ if (xdma2 < 0)
chip->single_dma = 1;
if ((err = snd_opl3sa2_detect(chip)) < 0)
goto __error;
- if (request_irq(irq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2/3", (void
*)chip)) {
+ if (request_irq(xirq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2/3", (void
+*)chip)) {
err = -ENODEV;
goto __error;
}
- chip->irq = irq;
+ chip->irq = xirq;
if ((err = snd_cs4231_create(card,
- snd_wss_port[dev] + 4, -1,
- irq, dma1, dma2,
+ wss_port[dev] + 4, -1,
+ xirq, xdma1, xdma2,
CS4231_HW_OPL3SA2,
CS4231_HWSHARE_IRQ,
&cs4231)) < 0) {
- snd_printd("Oops, WSS not detected at 0x%lx\n", snd_wss_port[dev] + 4);
+ snd_printd("Oops, WSS not detected at 0x%lx\n", wss_port[dev] + 4);
goto __error;
}
chip->cs4231 = cs4231;
@@ -801,9 +801,9 @@
goto __error;
if ((err = snd_cs4231_timer(cs4231, 0, NULL)) < 0)
goto __error;
- if (snd_fm_port[dev] >= 0x340 && snd_fm_port[dev] < 0x400) {
- if ((err = snd_opl3_create(card, snd_fm_port[dev],
- snd_fm_port[dev] + 2,
+ if (fm_port[dev] >= 0x340 && fm_port[dev] < 0x400) {
+ if ((err = snd_opl3_create(card, fm_port[dev],
+ fm_port[dev] + 2,
OPL3_HW_OPL3, 0, &opl3)) < 0)
goto __error;
if ((err = snd_opl3_timer_new(opl3, 1, 2)) < 0)
@@ -811,10 +811,10 @@
if ((err = snd_opl3_hwdep_new(opl3, 0, 1, &chip->synth)) < 0)
goto __error;
}
- if (snd_midi_port[dev] >= 0x300 && snd_midi_port[dev] < 0x340) {
+ if (midi_port[dev] >= 0x300 && midi_port[dev] < 0x340) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2,
- snd_midi_port[dev], 0,
- irq, 0, &chip->rmidi)) < 0)
+ midi_port[dev], 0,
+ xirq, 0, &chip->rmidi)) < 0)
goto __error;
}
#ifdef CONFIG_PM
@@ -837,9 +837,9 @@
#endif
sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
- card->shortname, chip->port, irq, dma1);
+ card->shortname, chip->port, xirq, xdma1);
if (dma2 >= 0)
- sprintf(card->longname + strlen(card->longname), "&%d", dma2);
+ sprintf(card->longname + strlen(card->longname), "&%d", xdma2);
if ((err = snd_card_register(card)) < 0)
goto __error;
@@ -860,7 +860,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev])
+ if (!enable[dev])
continue;
snd_opl3sa2_isapnp_cards[dev] = card;
snd_opl3sa2_isapnp_id[dev] = id;
@@ -879,10 +879,10 @@
int dev, cards = 0;
for (dev = 0; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev])
+ if (!enable[dev])
continue;
#ifdef __ISAPNP__
- if (snd_isapnp[dev])
+ if (isapnp[dev])
continue;
#endif
if (snd_opl3sa2_probe(dev) >= 0)
@@ -913,10 +913,10 @@
#ifndef MODULE
-/* format is: snd-opl3sa2=snd_enable,snd_index,snd_id,snd_isapnp,
- snd_port,snd_sb_port,snd_wss_port,snd_fm_port,
- snd_midi_port,snd_irq,snd_dma1,snd_dma2,
- snd_opl3sa3_ymode */
+/* format is: snd-opl3sa2=enable,index,id,isapnp,
+ port,sb_port,wss_port,fm_port,
+ midi_port,irq,dma1,dma2,
+ opl3sa3_ymode */
static int __init alsa_card_opl3sa2_setup(char *str)
{
@@ -925,22 +925,22 @@
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_sb_port[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_wss_port[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_fm_port[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_midi_port[nr_dev]) == 2 &&
- get_option(&str,&snd_irq[nr_dev]) == 2 &&
- get_option(&str,&snd_dma1[nr_dev]) == 2 &&
- get_option(&str,&snd_dma2[nr_dev]) == 2 &&
- get_option(&str,&snd_opl3sa3_ymode[nr_dev]) == 2);
+ get_option(&str,(int *)&port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&sb_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&wss_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&fm_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&midi_port[nr_dev]) == 2 &&
+ get_option(&str,&irq[nr_dev]) == 2 &&
+ get_option(&str,&dma1[nr_dev]) == 2 &&
+ get_option(&str,&dma2[nr_dev]) == 2 &&
+ get_option(&str,&opl3sa3_ymode[nr_dev]) == 2);
#ifdef __ISAPNP__
if (pnp != INT_MAX)
- snd_isapnp[nr_dev] = pnp;
+ isapnp[nr_dev] = pnp;
#endif
nr_dev++;
return 1;
Index: sgalaxy.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/sgalaxy.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sgalaxy.c 13 Oct 2002 13:08:40 -0000 1.11
+++ sgalaxy.c 21 Oct 2002 18:28:21 -0000 1.12
@@ -41,32 +41,32 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{Aztech Systems,Sound Galaxy}}");
-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 index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
+static char *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_sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240 */
-static long snd_wssport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /*
0x530,0xe80,0xf40,0x604 */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 7,9,10,11 */
-static int snd_dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Sound Galaxy 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 Galaxy soundcard.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_sbport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_sbport, "Port # for Sound Galaxy SB driver.");
-MODULE_PARM_SYNTAX(snd_sbport, SNDRV_ENABLED ",allows:{{0x220},{0x240}},dialog:list");
-MODULE_PARM(snd_wssport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_wssport, "Port # for Sound Galaxy WSS driver.");
-MODULE_PARM_SYNTAX(snd_wssport, SNDRV_ENABLED
",allows:{{0x530},{0xe80},{0xf40},{0x604}},dialog:list");
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for Sound Galaxy driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_ENABLED ",allows:{{7},{9},{10},{11}},dialog:list");
-MODULE_PARM(snd_dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma1, "DMA1 # for Sound Galaxy driver.");
-MODULE_PARM_SYNTAX(snd_dma1, SNDRV_DMA8_DESC);
+static long sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240 */
+static long wssport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x530,0xe80,0xf40,0x604 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 7,9,10,11 */
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Sound Galaxy 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 Galaxy soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(sbport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(sbport, "Port # for Sound Galaxy SB driver.");
+MODULE_PARM_SYNTAX(sbport, SNDRV_ENABLED ",allows:{{0x220},{0x240}},dialog:list");
+MODULE_PARM(wssport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(wssport, "Port # for Sound Galaxy WSS driver.");
+MODULE_PARM_SYNTAX(wssport, SNDRV_ENABLED
+",allows:{{0x530},{0xe80},{0xf40},{0x604}},dialog:list");
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for Sound Galaxy driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_ENABLED ",allows:{{7},{9},{10},{11}},dialog:list");
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "DMA1 # for Sound Galaxy driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_DMA8_DESC);
#define SGALAXY_AUXC_LEFT 18
#define SGALAXY_AUXC_RIGHT 19
@@ -167,13 +167,13 @@
#endif
/* switch to WSS mode */
- snd_sgalaxy_sbdsp_reset(snd_sbport[dev]);
+ snd_sgalaxy_sbdsp_reset(sbport[dev]);
- snd_sgalaxy_sbdsp_command(snd_sbport[dev], 9);
- snd_sgalaxy_sbdsp_command(snd_sbport[dev], 0);
+ snd_sgalaxy_sbdsp_command(sbport[dev], 9);
+ snd_sgalaxy_sbdsp_command(sbport[dev], 0);
udelay(400);
- return snd_sgalaxy_setup_wss(snd_wssport[dev], irq, dma);
+ return snd_sgalaxy_setup_wss(wssport[dev], irq, dma);
}
#define SGALAXY_CONTROLS 2
@@ -222,46 +222,46 @@
{
static int possible_irqs[] = {7, 9, 10, 11, -1};
static int possible_dmas[] = {1, 3, 0, -1};
- int err, irq, dma1;
+ int err, xirq, xdma1;
snd_card_t *card;
ad1848_t *chip;
- if (snd_sbport[dev] == SNDRV_AUTO_PORT) {
+ if (sbport[dev] == SNDRV_AUTO_PORT) {
snd_printk("specify SB port\n");
return -EINVAL;
}
- if (snd_wssport[dev] == SNDRV_AUTO_PORT) {
+ if (wssport[dev] == SNDRV_AUTO_PORT) {
snd_printk("specify WSS port\n");
return -EINVAL;
}
- card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE, 0);
+ card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
- irq = snd_irq[dev];
- if (irq == SNDRV_AUTO_IRQ) {
- if ((irq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
+ xirq = irq[dev];
+ if (xirq == SNDRV_AUTO_IRQ) {
+ if ((xirq = snd_legacy_find_free_irq(possible_irqs)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free IRQ\n");
return -EBUSY;
}
}
- dma1 = snd_dma1[dev];
- if (dma1 == SNDRV_AUTO_DMA) {
- if ((dma1 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
+ xdma1 = dma1[dev];
+ if (xdma1 == SNDRV_AUTO_DMA) {
+ if ((xdma1 = snd_legacy_find_free_dma(possible_dmas)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free DMA\n");
return -EBUSY;
}
}
- if ((err = snd_sgalaxy_detect(dev, irq, dma1)) < 0) {
+ if ((err = snd_sgalaxy_detect(dev, xirq, xdma1)) < 0) {
snd_card_free(card);
return err;
}
- if ((err = snd_ad1848_create(card, snd_wssport[dev] + 4,
- irq, dma1,
+ if ((err = snd_ad1848_create(card, wssport[dev] + 4,
+ xirq, xdma1,
AD1848_HW_DETECT, &chip)) < 0) {
snd_card_free(card);
return err;
@@ -286,7 +286,7 @@
strcpy(card->driver, "Sound Galaxy");
strcpy(card->shortname, "Sound Galaxy");
sprintf(card->longname, "Sound Galaxy at 0x%lx, irq %d, dma %d",
- snd_wssport[dev], irq, dma1);
+ wssport[dev], xirq, xdma1);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
@@ -327,9 +327,9 @@
#ifndef MODULE
-/* format is: snd-sgalaxy=snd_enable,snd_index,snd_id,
- snd_sbport,snd_wssport,
- snd_irq,snd_dma1 */
+/* format is: snd-sgalaxy=snd_enable,index,id,
+ sbport,wssport,
+ irq,dma1 */
static int __init alsa_card_sgalaxy_setup(char *str)
{
@@ -338,12 +338,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_sbport[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_wssport[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_irq[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_dma1[nr_dev]) == 2);
+ get_option(&str,&index[nr_dev]) == 2 &&
+ get_id(&str,&id[nr_dev]) == 2 &&
+ get_option(&str,(int *)&sbport[nr_dev]) == 2 &&
+ get_option(&str,(int *)&wssport[nr_dev]) == 2 &&
+ get_option(&str,(int *)&irq[nr_dev]) == 2 &&
+ get_option(&str,(int *)&dma1[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
