Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory usw-pr-cvs1:/tmp/cvs-serv18246/isa/gus
Modified Files:
gusclassic.c gusextreme.c gusmax.c interwave.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: gusclassic.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusclassic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gusclassic.c 25 May 2002 10:26:09 -0000 1.9
+++ gusclassic.c 21 Oct 2002 18:28:22 -0000 1.10
@@ -38,48 +38,48 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{Gravis,UltraSound Classic}}");
-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,0x230,0x240,0x250,0x260 */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 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_joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
+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,0x230,0x240,0x250,0x260 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 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 joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
/* 0 to 31, (0.59V-4.52V or 0.389V-2.98V) */
-static int snd_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 24};
-static int snd_pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
+static int channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 24};
+static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for GUS Classic 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 GUS Classic 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 GUS Classic 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 GUS Classic driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED
",allows:{{0x220,0x260,0x10}},dialog:list");
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for GUS Classic driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_ENABLED
",allows:{{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 GUS Classic 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 GUS Classic driver.");
-MODULE_PARM_SYNTAX(snd_dma2, SNDRV_ENABLED
",allows:{{1},{3},{5},{6},{7}},dialog:list");
-MODULE_PARM(snd_joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V
for GUS Classic driver.");
-MODULE_PARM_SYNTAX(snd_joystick_dac, SNDRV_ENABLED ",allows:{{0,31}}");
-MODULE_PARM(snd_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_channels, "GF1 channels for GUS Classic driver.");
-MODULE_PARM_SYNTAX(snd_channels, SNDRV_ENABLED ",allows:{{14,32}}");
-MODULE_PARM(snd_pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_channels, "Reserved PCM channels for GUS Classic driver.");
-MODULE_PARM_SYNTAX(snd_pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for GUS Classic soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for GUS Classic soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable GUS Classic soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for GUS Classic driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED ",allows:{{0x220,0x260,0x10}},dialog:list");
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for GUS Classic driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_ENABLED
+",allows:{{3},{5},{9},{11},{12},{15}},dialog:list");
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "DMA1 # for GUS Classic 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 GUS Classic driver.");
+MODULE_PARM_SYNTAX(dma2, SNDRV_ENABLED ",allows:{{1},{3},{5},{6},{7}},dialog:list");
+MODULE_PARM(joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for
+GUS Classic driver.");
+MODULE_PARM_SYNTAX(joystick_dac, SNDRV_ENABLED ",allows:{{0,31}}");
+MODULE_PARM(channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(channels, "GF1 channels for GUS Classic driver.");
+MODULE_PARM_SYNTAX(channels, SNDRV_ENABLED ",allows:{{14,32}}");
+MODULE_PARM(pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Classic driver.");
+MODULE_PARM_SYNTAX(pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
static snd_card_t *snd_gusclassic_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
@@ -125,45 +125,45 @@
gus->equal_irq = 0;
gus->codec_flag = 0;
gus->max_flag = 0;
- gus->joystick_dac = snd_joystick_dac[dev];
+ gus->joystick_dac = joystick_dac[dev];
}
static int __init snd_gusclassic_probe(int dev)
{
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
- int irq, dma1, dma2;
+ int xirq, xdma1, xdma2;
snd_card_t *card;
struct snd_gusclassic *guscard;
snd_gus_card_t *gus = NULL;
int err;
- 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;
guscard = (struct snd_gusclassic *)card->private_data;
- if (snd_pcm_channels[dev] < 2)
- snd_pcm_channels[dev] = 2;
+ if (pcm_channels[dev] < 2)
+ pcm_channels[dev] = 2;
- 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;
@@ -172,9 +172,9 @@
if ((err = snd_gus_create(card,
- snd_port[dev],
- irq, dma1, dma2,
- 0, snd_channels[dev], snd_pcm_channels[dev],
+ port[dev],
+ xirq, xdma1, xdma2,
+ 0, channels[dev], pcm_channels[dev],
0, &gus)) < 0) {
snd_card_free(card);
return err;
@@ -207,9 +207,9 @@
return err;
}
}
- sprintf(card->longname + strlen(card->longname), " at 0x%lx, irq %d, dma %d",
gus->gf1.port, irq, dma1);
+ sprintf(card->longname + strlen(card->longname), " at 0x%lx, irq %d, dma %d",
+gus->gf1.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) {
snd_card_free(card);
return err;
@@ -218,18 +218,18 @@
return 0;
}
-static int __init snd_gusclassic_legacy_auto_probe(unsigned long port)
+static int __init snd_gusclassic_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_gusclassic_probe(dev);
if (res < 0)
- snd_port[dev] = SNDRV_AUTO_PORT;
+ port[dev] = SNDRV_AUTO_PORT;
return res;
}
return -ENODEV;
@@ -240,8 +240,8 @@
static unsigned long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 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_gusclassic_probe(dev) >= 0)
cards++;
@@ -269,11 +269,11 @@
#ifndef MODULE
-/* format is: snd-gusclassic=snd_enable,snd_index,snd_id,
- snd_port,snd_irq,
- snd_dma1,snd_dma2,
- snd_joystick_dac,
- snd_channels,snd_pcm_channels */
+/* format is: snd-gusclassic=enable,index,id,
+ port,irq,
+ dma1,dma2,
+ joystick_dac,
+ channels,pcm_channels */
static int __init alsa_card_gusclassic_setup(char *str)
{
@@ -281,16 +281,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,&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_joystick_dac[nr_dev]) == 2 &&
- get_option(&str,&snd_channels[nr_dev]) == 2 &&
- get_option(&str,&snd_pcm_channels[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,&dma1[nr_dev]) == 2 &&
+ get_option(&str,&dma2[nr_dev]) == 2 &&
+ get_option(&str,&joystick_dac[nr_dev]) == 2 &&
+ get_option(&str,&channels[nr_dev]) == 2 &&
+ get_option(&str,&pcm_channels[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: gusextreme.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusextreme.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gusextreme.c 25 May 2002 10:26:09 -0000 1.9
+++ gusextreme.c 21 Oct 2002 18:28:22 -0000 1.10
@@ -41,64 +41,64 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{Gravis,UltraSound Extreme}}");
-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 long snd_gf1_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS) - 1] = -1}; /*
0x210,0x220,0x230,0x240,0x250,0x260,0x270 */
-static long snd_mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS) - 1] = -1}; /*
0x300,0x310,0x320 */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
-static int snd_mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
-static int snd_gf1_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 2,3,5,9,11,12,15 */
-static int snd_dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
-static int snd_dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
-static int snd_joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
+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 long gf1_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS) - 1] = -1}; /*
+0x210,0x220,0x230,0x240,0x250,0x260,0x270 */
+static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS) - 1] = -1}; /*
+0x300,0x310,0x320 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
+static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */
+static int gf1_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 2,3,5,9,11,12,15 */
+static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+static int joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
/* 0 to 31, (0.59V-4.52V or 0.389V-2.98V) */
-static int snd_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 24};
-static int snd_pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
+static int channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 24};
+static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for GUS Extreme 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 GUS Extreme 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 GUS Extreme 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 GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED
",allows:{{0x220,0x260,0x20}},dialog:list");
-MODULE_PARM(snd_gf1_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_gf1_port, "GF1 port # for GUS Extreme driver (optional).");
-MODULE_PARM_SYNTAX(snd_gf1_port, SNDRV_ENABLED
",allows:{{0x210,0x270,0x10}},dialog:list");
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port # for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_ENABLED
",allows:{{0x300,0x320,0x10}},dialog:list");
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_ENABLED ",allows:{{5},{7},{9},{10}},dialog:list");
-MODULE_PARM(snd_mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_mpu_irq, "MPU-401 IRQ # for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_mpu_irq, SNDRV_ENABLED
",allows:{{5},{7},{9},{10}},dialog:list");
-MODULE_PARM(snd_gf1_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_gf1_irq, "GF1 IRQ # for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_gf1_irq, SNDRV_ENABLED
",allows:{{2},{3},{5},{9},{11},{12},{15}},dialog:list");
-MODULE_PARM(snd_dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma8, "8-bit DMA # for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_dma8, SNDRV_DMA8_DESC);
-MODULE_PARM(snd_dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma1, "GF1 DMA # for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_dma1, SNDRV_DMA_DESC);
-MODULE_PARM(snd_joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V
for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_joystick_dac, SNDRV_ENABLED ",allows:{{0,31}}");
-MODULE_PARM(snd_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_channels, "GF1 channels for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_channels, SNDRV_ENABLED ",allows:{{14,32}}");
-MODULE_PARM(snd_pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_channels, "Reserved PCM channels for GUS Extreme driver.");
-MODULE_PARM_SYNTAX(snd_pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for GUS Extreme soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for GUS Extreme soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable GUS Extreme soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED ",allows:{{0x220,0x260,0x20}},dialog:list");
+MODULE_PARM(gf1_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(gf1_port, "GF1 port # for GUS Extreme driver (optional).");
+MODULE_PARM_SYNTAX(gf1_port, SNDRV_ENABLED
+",allows:{{0x210,0x270,0x10}},dialog:list");
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED
+",allows:{{0x300,0x320,0x10}},dialog:list");
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_ENABLED ",allows:{{5},{7},{9},{10}},dialog:list");
+MODULE_PARM(mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(mpu_irq, SNDRV_ENABLED ",allows:{{5},{7},{9},{10}},dialog:list");
+MODULE_PARM(gf1_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(gf1_irq, "GF1 IRQ # for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(gf1_irq, SNDRV_ENABLED
+",allows:{{2},{3},{5},{9},{11},{12},{15}},dialog:list");
+MODULE_PARM(dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma8, "8-bit DMA # for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC);
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "GF1 DMA # for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_DMA_DESC);
+MODULE_PARM(joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for
+GUS Extreme driver.");
+MODULE_PARM_SYNTAX(joystick_dac, SNDRV_ENABLED ",allows:{{0,31}}");
+MODULE_PARM(channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(channels, "GF1 channels for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(channels, SNDRV_ENABLED ",allows:{{14,32}}");
+MODULE_PARM(pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS Extreme driver.");
+MODULE_PARM_SYNTAX(pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
static snd_card_t *snd_gusextreme_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
@@ -128,11 +128,11 @@
snd_es1688_mixer_write(es1688, 0x40, 0x0b); /* don't change!!! */
spin_unlock_irqrestore(&es1688->mixer_lock, flags);
spin_lock_irqsave(&es1688->reg_lock, flags);
- outb(snd_gf1_port[dev] & 0x040 ? 2 : 0, ES1688P(es1688, INIT1));
+ outb(gf1_port[dev] & 0x040 ? 2 : 0, ES1688P(es1688, INIT1));
outb(0, 0x201);
- outb(snd_gf1_port[dev] & 0x020 ? 2 : 0, ES1688P(es1688, INIT1));
+ outb(gf1_port[dev] & 0x020 ? 2 : 0, ES1688P(es1688, INIT1));
outb(0, 0x201);
- outb(snd_gf1_port[dev] & 0x010 ? 3 : 1, ES1688P(es1688, INIT1));
+ outb(gf1_port[dev] & 0x010 ? 3 : 1, ES1688P(es1688, INIT1));
spin_unlock_irqrestore(&es1688->reg_lock, flags);
udelay(100);
@@ -173,7 +173,7 @@
static void __init snd_gusextreme_init(int dev, snd_gus_card_t * gus)
{
- gus->joystick_dac = snd_joystick_dac[dev];
+ gus->joystick_dac = joystick_dac[dev];
}
static int __init snd_gusextreme_mixer(es1688_t *chip)
@@ -204,7 +204,7 @@
static int possible_ess_dmas[] = {1, 3, 0, -1};
static int possible_gf1_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
static int possible_gf1_dmas[] = {5, 6, 7, 1, 3, -1};
- int gf1_irq, gf1_dma, ess_irq, mpu_irq, ess_dma;
+ int xgf1_irq, xgf1_dma, xess_irq, xmpu_irq, xess_dma;
snd_card_t *card;
struct snd_gusextreme *acard;
snd_gus_card_t *gus;
@@ -212,64 +212,64 @@
opl3_t *opl3;
int err;
- 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;
acard = (struct snd_gusextreme *)card->private_data;
- gf1_irq = snd_gf1_irq[dev];
- if (gf1_irq == SNDRV_AUTO_IRQ) {
- if ((gf1_irq = snd_legacy_find_free_irq(possible_gf1_irqs)) < 0) {
+ xgf1_irq = gf1_irq[dev];
+ if (xgf1_irq == SNDRV_AUTO_IRQ) {
+ if ((xgf1_irq = snd_legacy_find_free_irq(possible_gf1_irqs)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free IRQ for GF1\n");
return -EBUSY;
}
}
- ess_irq = snd_irq[dev];
- if (ess_irq == SNDRV_AUTO_IRQ) {
- if ((ess_irq = snd_legacy_find_free_irq(possible_ess_irqs)) < 0) {
+ xess_irq = irq[dev];
+ if (xess_irq == SNDRV_AUTO_IRQ) {
+ if ((xess_irq = snd_legacy_find_free_irq(possible_ess_irqs)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free IRQ for ES1688\n");
return -EBUSY;
}
}
- if (snd_mpu_port[dev] == SNDRV_AUTO_PORT)
- snd_mpu_port[dev] = 0;
- mpu_irq = snd_mpu_irq[dev];
- if (mpu_irq > 15)
- mpu_irq = -1;
- gf1_dma = snd_dma1[dev];
- if (gf1_dma == SNDRV_AUTO_DMA) {
- if ((gf1_dma = snd_legacy_find_free_dma(possible_gf1_dmas)) < 0) {
+ if (mpu_port[dev] == SNDRV_AUTO_PORT)
+ mpu_port[dev] = 0;
+ xmpu_irq = mpu_irq[dev];
+ if (xmpu_irq > 15)
+ xmpu_irq = -1;
+ xgf1_dma = dma1[dev];
+ if (xgf1_dma == SNDRV_AUTO_DMA) {
+ if ((xgf1_dma = snd_legacy_find_free_dma(possible_gf1_dmas)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free DMA for GF1\n");
return -EBUSY;
}
}
- ess_dma = snd_dma8[dev];
- if (ess_dma == SNDRV_AUTO_DMA) {
- if ((ess_dma = snd_legacy_find_free_dma(possible_ess_dmas)) < 0) {
+ xess_dma = dma8[dev];
+ if (xess_dma == SNDRV_AUTO_DMA) {
+ if ((xess_dma = snd_legacy_find_free_dma(possible_ess_dmas)) < 0) {
snd_card_free(card);
snd_printk("unable to find a free DMA for ES1688\n");
return -EBUSY;
}
}
- if ((err = snd_es1688_create(card, snd_port[dev], snd_mpu_port[dev],
- ess_irq, mpu_irq, ess_dma,
+ if ((err = snd_es1688_create(card, port[dev], mpu_port[dev],
+ xess_irq, xmpu_irq, xess_dma,
ES1688_HW_1688, &es1688)) < 0) {
snd_card_free(card);
return err;
}
- if (snd_gf1_port[dev] < 0)
- snd_gf1_port[dev] = snd_port[dev] + 0x20;
+ if (gf1_port[dev] < 0)
+ gf1_port[dev] = port[dev] + 0x20;
if ((err = snd_gus_create(card,
- snd_gf1_port[dev],
- gf1_irq,
- gf1_dma,
+ gf1_port[dev],
+ xgf1_irq,
+ xgf1_dma,
-1,
- 0, snd_channels[dev],
- snd_pcm_channels[dev], 0,
+ 0, channels[dev],
+ pcm_channels[dev], 0,
&gus)) < 0) {
snd_card_free(card);
return err;
@@ -297,7 +297,7 @@
return err;
}
snd_component_add(card, "ES1688");
- if (snd_pcm_channels[dev] > 0) {
+ if (pcm_channels[dev] > 0) {
if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) < 0) {
snd_card_free(card);
return err;
@@ -325,7 +325,7 @@
if (es1688->mpu_port >= 0x300) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
es1688->mpu_port, 0,
- mpu_irq,
+ xmpu_irq,
SA_INTERRUPT,
NULL)) < 0) {
snd_card_free(card);
@@ -334,7 +334,7 @@
}
sprintf(card->longname, "Gravis UltraSound Extreme at 0x%lx, irq %i&%i, dma
%i&%i",
- es1688->port, gf1_irq, ess_irq, gf1_dma, ess_dma);
+ es1688->port, xgf1_irq, xess_irq, xgf1_dma, xess_dma);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
return err;
@@ -343,18 +343,18 @@
return 0;
}
-static int __init snd_gusextreme_legacy_auto_probe(unsigned long port)
+static int __init snd_gusextreme_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_gusextreme_probe(dev);
if (res < 0)
- snd_port[dev] = SNDRV_AUTO_PORT;
+ port[dev] = SNDRV_AUTO_PORT;
return res;
}
return -ENODEV;
@@ -365,8 +365,8 @@
static unsigned long possible_ports[] = {0x220, 0x240, 0x260, -1};
int dev, cards;
- for (dev = cards = 0; dev < SNDRV_CARDS && snd_enable[dev] > 0; dev++) {
- if (snd_port[dev] == SNDRV_AUTO_PORT)
+ for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev] > 0; dev++) {
+ if (port[dev] == SNDRV_AUTO_PORT)
continue;
if (snd_gusextreme_probe(dev) >= 0)
cards++;
@@ -401,12 +401,12 @@
#ifndef MODULE
-/* format is: snd-gusextreme=snd_enable,snd_index,snd_id,
- snd_port,snd_gf1_port,snd_mpu_port,
- snd_irq,snd_gf1_irq,snd_mpu_irq,
- snd_dma8,snd_dma1,
- snd_joystick_dac,
- snd_channels,snd_pcm_channels */
+/* format is: snd-gusextreme=enable,index,id,
+ port,gf1_port,mpu_port,
+ irq,gf1_irq,mpu_irq,
+ dma8,dma1,
+ joystick_dac,
+ channels,pcm_channels */
static int __init alsa_card_gusextreme_setup(char *str)
{
@@ -414,17 +414,17 @@
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_gf1_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_gf1_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_dma1[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 *)&gf1_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&mpu_port[nr_dev]) == 2 &&
+ get_option(&str,&irq[nr_dev]) == 2 &&
+ get_option(&str,&gf1_irq[nr_dev]) == 2 &&
+ get_option(&str,&mpu_irq[nr_dev]) == 2 &&
+ get_option(&str,&dma8[nr_dev]) == 2 &&
+ get_option(&str,&dma1[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: gusmax.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusmax.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gusmax.c 25 May 2002 10:26:09 -0000 1.9
+++ gusmax.c 21 Oct 2002 18:28:22 -0000 1.10
@@ -39,48 +39,48 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{Gravis,UltraSound MAX}}");
-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,0x230,0x240,0x250,0x260 */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 2,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_joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
+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,0x230,0x240,0x250,0x260 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 2,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 joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
/* 0 to 31, (0.59V-4.52V or 0.389V-2.98V) */
-static int snd_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 24};
-static int snd_pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
+static int channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 24};
+static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for GUS MAX 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 GUS MAX 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 GUS MAX 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 GUS MAX driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED
",allows:{{0x220},{0x230},{0x240},{0x250},{0x260}},dialog:list");
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for GUS MAX driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_ENABLED
",allows:{{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 GUS MAX driver.");
-MODULE_PARM_SYNTAX(snd_dma1, SNDRV_DMA_DESC);
-MODULE_PARM(snd_dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma2, "DMA2 # for GUS MAX driver.");
-MODULE_PARM_SYNTAX(snd_dma2, SNDRV_DMA_DESC);
-MODULE_PARM(snd_joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V
for GUS MAX driver.");
-MODULE_PARM_SYNTAX(snd_joystick_dac, SNDRV_ENABLED ",allows:{{0,31}}");
-MODULE_PARM(snd_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_channels, "Used GF1 channels for GUS MAX driver.");
-MODULE_PARM_SYNTAX(snd_channels, SNDRV_ENABLED ",allows:{{14,32}}");
-MODULE_PARM(snd_pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_channels, "Reserved PCM channels for GUS MAX driver.");
-MODULE_PARM_SYNTAX(snd_pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for GUS MAX soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for GUS MAX soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable GUS MAX soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for GUS MAX driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED
+",allows:{{0x220},{0x230},{0x240},{0x250},{0x260}},dialog:list");
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for GUS MAX driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_ENABLED
+",allows:{{3},{5},{9},{11},{12},{15}},dialog:list");
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "DMA1 # for GUS MAX driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_DMA_DESC);
+MODULE_PARM(dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma2, "DMA2 # for GUS MAX driver.");
+MODULE_PARM_SYNTAX(dma2, SNDRV_DMA_DESC);
+MODULE_PARM(joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for
+GUS MAX driver.");
+MODULE_PARM_SYNTAX(joystick_dac, SNDRV_ENABLED ",allows:{{0,31}}");
+MODULE_PARM(channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(channels, "Used GF1 channels for GUS MAX driver.");
+MODULE_PARM_SYNTAX(channels, SNDRV_ENABLED ",allows:{{14,32}}");
+MODULE_PARM(pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for GUS MAX driver.");
+MODULE_PARM_SYNTAX(pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
struct snd_gusmax {
int irq;
@@ -151,7 +151,7 @@
{
gus->equal_irq = 1;
gus->codec_flag = 1;
- gus->joystick_dac = snd_joystick_dac[dev];
+ gus->joystick_dac = joystick_dac[dev];
/* init control register */
gus->max_cntrl_val = (gus->gf1.port >> 4) & 0x0f;
if (gus->gf1.dma1 > 3)
@@ -228,13 +228,13 @@
{
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
- int irq, dma1, dma2, err;
+ int xirq, xdma1, xdma2, err;
snd_card_t *card;
snd_gus_card_t *gus = NULL;
cs4231_t *cs4231;
struct snd_gusmax *maxcard;
- 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_gusmax));
if (card == NULL)
return -ENOMEM;
@@ -243,25 +243,25 @@
maxcard->card = card;
maxcard->irq = -1;
- 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;
@@ -269,10 +269,10 @@
}
if ((err = snd_gus_create(card,
- snd_port[dev],
- -irq, dma1, dma2,
- 0, snd_channels[dev],
- snd_pcm_channels[dev],
+ port[dev],
+ -xirq, xdma1, xdma2,
+ 0, channels[dev],
+ pcm_channels[dev],
0, &gus)) < 0) {
snd_card_free(card);
return err;
@@ -294,16 +294,16 @@
return -ENODEV;
}
- if (request_irq(irq, snd_gusmax_interrupt, SA_INTERRUPT, "GUS MAX", (void
*)maxcard)) {
+ if (request_irq(xirq, snd_gusmax_interrupt, SA_INTERRUPT, "GUS MAX", (void
+*)maxcard)) {
snd_card_free(card);
- printk(KERN_ERR "gusmax: unable to grab IRQ %d\n", irq);
+ printk(KERN_ERR "gusmax: unable to grab IRQ %d\n", xirq);
return -EBUSY;
}
- maxcard->irq = irq;
+ maxcard->irq = xirq;
if ((err = snd_cs4231_create(card,
- gus->gf1.port + 0x10c, -1, irq,
- dma2 < 0 ? dma1 : dma2, dma1,
+ gus->gf1.port + 0x10c, -1, xirq,
+ xdma2 < 0 ? xdma1 : xdma2, xdma1,
CS4231_HW_DETECT,
CS4231_HWSHARE_IRQ |
CS4231_HWSHARE_DMA1 |
@@ -324,7 +324,7 @@
snd_card_free(card);
return err;
}
- if (snd_pcm_channels[dev] > 0) {
+ if (pcm_channels[dev] > 0) {
if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) < 0) {
snd_card_free(card);
return err;
@@ -340,9 +340,9 @@
return err;
}
- sprintf(card->longname + strlen(card->longname), " at 0x%lx, irq %i, dma %i",
gus->gf1.port, irq, dma1);
- if (dma2 >= 0)
- sprintf(card->longname + strlen(card->longname), "&%i", dma2);
+ sprintf(card->longname + strlen(card->longname), " at 0x%lx, irq %i, dma %i",
+gus->gf1.port, xirq, xdma1);
+ if (xdma2 >= 0)
+ sprintf(card->longname + strlen(card->longname), "&%i", xdma2);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
return err;
@@ -354,18 +354,18 @@
return 0;
}
-static int __init snd_gusmax_legacy_auto_probe(unsigned long port)
+static int __init snd_gusmax_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_gusmax_probe(dev);
if (res < 0)
- snd_port[dev] = SNDRV_AUTO_PORT;
+ port[dev] = SNDRV_AUTO_PORT;
return res;
}
return -ENODEV;
@@ -376,8 +376,8 @@
static unsigned long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260,
-1};
int dev, cards;
- for (dev = cards = 0; dev < SNDRV_CARDS && snd_enable[dev] > 0; dev++) {
- if (snd_port[dev] == SNDRV_AUTO_PORT)
+ for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev] > 0; dev++) {
+ if (port[dev] == SNDRV_AUTO_PORT)
continue;
if (snd_gusmax_probe(dev) >= 0)
cards++;
@@ -405,11 +405,11 @@
#ifndef MODULE
-/* format is: snd-gusmax=snd_enable,snd_index,snd_id,
- snd_port,snd_irq,
- snd_dma1,snd_dma2,
- snd_joystick_dac,
- snd_channels,snd_pcm_channels */
+/* format is: snd-gusmax=enable,index,id,
+ port,irq,
+ dma1,dma2,
+ joystick_dac,
+ channels,pcm_channels */
static int __init alsa_card_gusmax_setup(char *str)
{
@@ -417,16 +417,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,&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_joystick_dac[nr_dev]) == 2 &&
- get_option(&str,&snd_channels[nr_dev]) == 2 &&
- get_option(&str,&snd_pcm_channels[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,&dma1[nr_dev]) == 2 &&
+ get_option(&str,&dma2[nr_dev]) == 2 &&
+ get_option(&str,&joystick_dac[nr_dev]) == 2 &&
+ get_option(&str,&channels[nr_dev]) == 2 &&
+ get_option(&str,&pcm_channels[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: interwave.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/interwave.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- interwave.c 13 Aug 2002 16:13:38 -0000 1.14
+++ interwave.c 21 Oct 2002 18:28:22 -0000 1.15
@@ -59,66 +59,66 @@
MODULE_DEVICES("{{AMD,InterWave STB with TEA6330T}}");
#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
*/
+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; /*
0x210,0x220,0x230,0x240,0x250,0x260 */
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /*
+0x210,0x220,0x230,0x240,0x250,0x260 */
#ifdef SNDRV_STB
-static long snd_port_tc[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /*
0x350,0x360,0x370,0x380 */
+static long port_tc[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x350,0x360,0x370,0x380 */
#endif
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 2,3,5,9,11,12,15 */
-static int snd_dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
-static int snd_dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
-static int snd_joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 2,3,5,9,11,12,15 */
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
+static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7 */
+static int joystick_dac[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 29};
/* 0 to 31, (0.59V-4.52V or 0.389V-2.98V) */
-static int snd_midi[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
-static int snd_pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
-static int snd_effect[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for InterWave 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 InterWave 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 InterWave soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-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);
-MODULE_PARM(snd_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_port, "Port # for InterWave driver.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED
",allows:{{0x210,0x260,0x10}},dialog:list");
-#ifdef SNDRV_STB
-MODULE_PARM(snd_port_tc, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_port_tc, "Tone control (TEA6330T - i2c bus) port # for InterWave
driver.");
-MODULE_PARM_SYNTAX(snd_port_tc, SNDRV_ENABLED
",allows:{{0x350,0x380,0x10}},dialog:list");
-#endif
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for InterWave driver.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_ENABLED
",allows:{{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 InterWave driver.");
-MODULE_PARM_SYNTAX(snd_dma1, SNDRV_DMA_DESC);
-MODULE_PARM(snd_dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dma2, "DMA2 # for InterWave driver.");
-MODULE_PARM_SYNTAX(snd_dma2, SNDRV_DMA_DESC);
-MODULE_PARM(snd_joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V
for InterWave driver.");
+static int midi[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
+static int effect[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for InterWave soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for InterWave soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable InterWave soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+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);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for InterWave driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED ",allows:{{0x210,0x260,0x10}},dialog:list");
+#ifdef SNDRV_STB
+MODULE_PARM(port_tc, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port_tc, "Tone control (TEA6330T - i2c bus) port # for InterWave
+driver.");
+MODULE_PARM_SYNTAX(port_tc, SNDRV_ENABLED ",allows:{{0x350,0x380,0x10}},dialog:list");
+#endif
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for InterWave driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_ENABLED
+",allows:{{3},{5},{9},{11},{12},{15}},dialog:list");
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "DMA1 # for InterWave driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_DMA_DESC);
+MODULE_PARM(dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma2, "DMA2 # for InterWave driver.");
+MODULE_PARM_SYNTAX(dma2, SNDRV_DMA_DESC);
+MODULE_PARM(joystick_dac, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(joystick_dac, "Joystick DAC level 0.59V-4.52V or 0.389V-2.98V for
+InterWave driver.");
MODULE_PARM_SYNTAX(snd_joystic_dac, SNDRV_ENABLED ",allows:{{0,31}}");
-MODULE_PARM(snd_midi, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_midi, "MIDI UART enable for InterWave driver.");
-MODULE_PARM_SYNTAX(snd_midi, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_channels, "Reserved PCM channels for InterWave driver.");
-MODULE_PARM_SYNTAX(snd_pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
-MODULE_PARM(snd_effect, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_effect, "Effects enable for InterWave driver.");
-MODULE_PARM_SYNTAX(snd_effect, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
+MODULE_PARM(midi, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(midi, "MIDI UART enable for InterWave driver.");
+MODULE_PARM_SYNTAX(midi, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
+MODULE_PARM(pcm_channels, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for InterWave driver.");
+MODULE_PARM_SYNTAX(pcm_channels, SNDRV_ENABLED ",allows:{{2,16}}");
+MODULE_PARM(effect, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(effect, "Effects enable for InterWave driver.");
+MODULE_PARM_SYNTAX(effect, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
struct snd_interwave {
int irq;
@@ -237,7 +237,7 @@
int err;
*rbus = NULL;
- port = snd_port_tc[dev];
+ port = port_tc[dev];
if (port == SNDRV_AUTO_PORT) {
port = 0x350;
if (gus->gf1.port == 0x250) {
@@ -527,7 +527,7 @@
gus->codec_flag = 1;
gus->interwave = 1;
gus->max_flag = 1;
- gus->joystick_dac = snd_joystick_dac[dev];
+ gus->joystick_dac = joystick_dac[dev];
}
@@ -611,19 +611,19 @@
pdev = iwcard->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);
- isapnp_resource_change(&pdev->resource[1], snd_port[dev] + 0x100, 12);
- isapnp_resource_change(&pdev->resource[2], snd_port[dev] + 0x10c, 4);
- }
- 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_dma2[dev] < 0)
+ if (port[dev] != SNDRV_AUTO_PORT) {
+ isapnp_resource_change(&pdev->resource[0], port[dev], 16);
+ isapnp_resource_change(&pdev->resource[1], port[dev] + 0x100, 12);
+ isapnp_resource_change(&pdev->resource[2], port[dev] + 0x10c, 4);
+ }
+ 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 (dma2[dev] < 0)
isapnp_resource_change(&pdev->dma_resource[1], 4, 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("isapnp configure failure (out of resources?)\n");
return -EBUSY;
@@ -634,16 +634,16 @@
pdev->deactivate(pdev);
return -ENOENT;
}
- snd_port[dev] = pdev->resource[0].start;
- snd_dma1[dev] = pdev->dma_resource[0].start;
- if (snd_dma2[dev] >= 0)
- snd_dma2[dev] = pdev->dma_resource[1].start;
- snd_irq[dev] = pdev->irq_resource[0].start;
+ port[dev] = pdev->resource[0].start;
+ dma1[dev] = pdev->dma_resource[0].start;
+ if (dma2[dev] >= 0)
+ dma2[dev] = pdev->dma_resource[1].start;
+ irq[dev] = pdev->irq_resource[0].start;
snd_printdd("isapnp IW: sb port=0x%lx, gf1 port=0x%lx, codec port=0x%lx\n",
pdev->resource[0].start,
pdev->resource[1].start,
pdev->resource[2].start);
- snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", snd_dma1[dev],
snd_dma2[dev], snd_irq[dev]);
+ snd_printdd("isapnp IW: dma1=%i, dma2=%i, irq=%i\n", dma1[dev], dma2[dev],
+irq[dev]);
#ifdef SNDRV_STB
/* Tone Control initialization */
pdev = iwcard->devtc;
@@ -651,15 +651,15 @@
iwcard->dev->deactivate(iwcard->dev);
return -EAGAIN;
}
- if (snd_port_tc[dev] != SNDRV_AUTO_PORT)
- isapnp_resource_change(&pdev->resource[0], snd_port_tc[dev], 1);
+ if (port_tc[dev] != SNDRV_AUTO_PORT)
+ isapnp_resource_change(&pdev->resource[0], port_tc[dev], 1);
if (pdev->activate(pdev)<0) {
snd_printk("Tone Control isapnp configure failure (out of
resources?)\n");
iwcard->dev->deactivate(iwcard->dev);
return -EBUSY;
}
- snd_port_tc[dev] = pdev->resource[0].start;
- snd_printdd("isapnp IW: tone control port=0x%lx\n", snd_port_tc[dev]);
+ port_tc[dev] = pdev->resource[0].start;
+ snd_printdd("isapnp IW: tone control port=0x%lx\n", port_tc[dev]);
#endif
return 0;
}
@@ -703,7 +703,7 @@
{
static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
static int possible_dmas[] = {0, 1, 3, 5, 6, 7, -1};
- int irq, dma1, dma2;
+ int xirq, xdma1, xdma2;
snd_card_t *card;
struct snd_interwave *iwcard;
cs4231_t *cs4231;
@@ -715,7 +715,7 @@
char *str;
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_interwave));
if (card == NULL)
return -ENOMEM;
@@ -724,30 +724,30 @@
iwcard->irq = -1;
card->private_free = snd_interwave_free;
#ifdef __ISAPNP__
- if (snd_isapnp[dev] && snd_interwave_isapnp(dev, iwcard)) {
+ if (isapnp[dev] && snd_interwave_isapnp(dev, iwcard)) {
snd_card_free(card);
return -ENODEV;
}
#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;
@@ -755,10 +755,10 @@
}
if ((err = snd_gus_create(card,
- snd_port[dev],
- -irq, dma1, dma2,
+ port[dev],
+ -xirq, xdma1, xdma2,
0, 32,
- snd_pcm_channels[dev], snd_effect[dev], &gus)) < 0) {
+ pcm_channels[dev], effect[dev], &gus)) < 0) {
snd_card_free(card);
return err;
}
@@ -780,16 +780,16 @@
return err;
}
- if (request_irq(irq, snd_interwave_interrupt, SA_INTERRUPT, "InterWave", (void
*)iwcard)) {
+ if (request_irq(xirq, snd_interwave_interrupt, SA_INTERRUPT, "InterWave",
+(void *)iwcard)) {
snd_card_free(card);
snd_printk("unable to grab IRQ %d\n", irq);
return -EBUSY;
}
- iwcard->irq = irq;
+ iwcard->irq = xirq;
if ((err = snd_cs4231_create(card,
- gus->gf1.port + 0x10c, -1, irq,
- dma2 < 0 ? dma1 : dma2, dma1,
+ gus->gf1.port + 0x10c, -1, xirq,
+ xdma2 < 0 ? xdma1 : xdma2, xdma1,
CS4231_HW_INTERWAVE,
CS4231_HWSHARE_IRQ |
CS4231_HWSHARE_DMA1 |
@@ -812,7 +812,7 @@
snd_card_free(card);
return err;
}
- if (snd_pcm_channels[dev] > 0) {
+ if (pcm_channels[dev] > 0) {
if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) < 0) {
snd_card_free(card);
return err;
@@ -848,7 +848,7 @@
}
#endif
- gus->uart_enable = snd_midi[dev];
+ gus->uart_enable = midi[dev];
if ((err = snd_gf1_rawmidi_new(gus, 0, NULL)) < 0) {
snd_card_free(card);
return err;
@@ -866,10 +866,10 @@
sprintf(card->longname, "%s at 0x%lx, irq %i, dma %d",
str,
gus->gf1.port,
- irq,
- dma1);
- if (dma2 >= 0)
- sprintf(card->longname + strlen(card->longname), "&%d", dma2);
+ xirq,
+ xdma1);
+ if (xdma2 >= 0)
+ sprintf(card->longname + strlen(card->longname), "&%d", xdma2);
if ((err = snd_card_register(card)) < 0) {
snd_card_free(card);
@@ -882,22 +882,22 @@
return 0;
}
-static int __init snd_interwave_probe_legacy_port(unsigned long port)
+static int __init snd_interwave_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_interwave_probe(dev);
if (res < 0)
- snd_port[dev] = SNDRV_AUTO_PORT;
+ port[dev] = SNDRV_AUTO_PORT;
return res;
}
return -ENODEV;
@@ -912,7 +912,7 @@
int res;
for ( ; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev] || !snd_isapnp[dev])
+ if (!enable[dev] || !isapnp[dev])
continue;
snd_interwave_isapnp_cards[dev] = card;
snd_interwave_isapnp_id[dev] = id;
@@ -935,10 +935,10 @@
int dev;
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_interwave_probe(dev)) {
@@ -946,7 +946,7 @@
continue;
}
#ifdef MODULE
- printk(KERN_ERR "InterWave soundcard #%i not found at 0x%lx or device
busy\n", dev, snd_port[dev]);
+ printk(KERN_ERR "InterWave soundcard #%i not found at 0x%lx or device
+busy\n", dev, port[dev]);
#endif
}
/* legacy auto configured cards */
@@ -978,11 +978,11 @@
#ifndef MODULE
-/* format is: snd-interwave=snd_enable,snd_index,snd_id,snd_isapnp,
- snd_port[,snd_port_tc],snd_irq,
- snd_dma1,snd_dma2,
- snd_joystick_dac,snd_midi,
- snd_pcm_channels,snd_effect */
+/* format is: snd-interwave=enable,index,id,isapnp,
+ port[,port_tc],irq,
+ dma1,dma2,
+ joystick_dac,midi,
+ pcm_channels,effect */
static int __init alsa_card_interwave_setup(char *str)
{
@@ -991,24 +991,24 @@
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 *)&port[nr_dev]) == 2 &&
#ifdef SNDRV_STB
- get_option(&str,(int *)&snd_port_tc[nr_dev]) == 2 &&
+ get_option(&str,(int *)&port_tc[nr_dev]) == 2 &&
#endif
- 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_joystick_dac[nr_dev]) == 2 &&
- get_option(&str,&snd_midi[nr_dev]) == 2 &&
- get_option(&str,&snd_pcm_channels[nr_dev]) == 2 &&
- get_option(&str,&snd_effect[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,&joystick_dac[nr_dev]) == 2 &&
+ get_option(&str,&midi[nr_dev]) == 2 &&
+ get_option(&str,&pcm_channels[nr_dev]) == 2 &&
+ get_option(&str,&effect[nr_dev]) == 2);
#ifdef __ISAPNP__
if (pnp != INT_MAX)
- snd_isapnp[nr_dev] = pnp;
+ isapnp[nr_dev] = pnp;
#endif
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
