Update of /cvsroot/alsa/alsa-kernel/sparc
In directory usw-pr-cvs1:/tmp/cvs-serv18246/sparc
Modified Files:
amd7930.c cs4231.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: amd7930.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/sparc/amd7930.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amd7930.c 30 Sep 2002 21:42:53 -0000 1.1
+++ amd7930.c 21 Oct 2002 18:28:26 -0000 1.2
@@ -47,19 +47,19 @@
#include <asm/irq.h>
#include <asm/sbus.h>
-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_PNP; /* Enable this card */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Sun AMD7930 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 Sun AMD7930 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 Sun AMD7930 soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_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_PNP; /* Enable this card */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Sun AMD7930 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for Sun AMD7930 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable Sun AMD7930 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
MODULE_AUTHOR("Thomas K. Dyas and David S. Miller");
MODULE_DESCRIPTION("Sun AMD7930");
MODULE_LICENSE("GPL");
@@ -1042,7 +1042,7 @@
if (dev >= SNDRV_CARDS)
return -ENODEV;
- if (!snd_enable[dev]) {
+ if (!enable[dev]) {
dev++;
return -ENOENT;
}
@@ -1070,7 +1070,7 @@
rp->flags = IORESOURCE_IO | (reg_prop.which_io & 0xff);
}
- 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;
@@ -1151,7 +1151,7 @@
#ifndef MODULE
-/* format is: snd-sun-amd7930=snd_index,snd_id,snd_enable */
+/* format is: snd-sun-amd7930=index,id,enable */
static int __init alsa_card_sun_amd7930_setup(char *str)
{
@@ -1159,9 +1159,9 @@
if (nr_dev >= SNDRV_CARDS)
return 0;
- (void)(get_option(&str,&snd_index[nr_dev]) == 2 &&
- get_option(&str,&snd_id[nr_dev]) == 2 &&
- get_id(&str,&snd_enable[nr_dev]) == 2);
+ (void)(get_option(&str,&index[nr_dev]) == 2 &&
+ get_option(&str,&id[nr_dev]) == 2 &&
+ get_id(&str,&enable[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: cs4231.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/sparc/cs4231.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cs4231.c 30 Sep 2002 21:42:53 -0000 1.1
+++ cs4231.c 21 Oct 2002 18:28:26 -0000 1.2
@@ -45,19 +45,19 @@
#include <asm/ebus.h>
#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_PNP; /* Enable this card */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Sun CS4231 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 Sun CS4231 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 Sun CS4231 soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_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_PNP; /* Enable this card */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Sun CS4231 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for Sun CS4231 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable Sun CS4231 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
MODULE_AUTHOR("Jaroslav Kysela, Derrick J. Brashear and David S. Miller");
MODULE_DESCRIPTION("Sun CS4231");
MODULE_LICENSE("GPL");
@@ -1891,12 +1891,12 @@
if (dev >= SNDRV_CARDS)
return -ENODEV;
- if (!snd_enable[dev]) {
+ if (!enable[dev]) {
dev++;
return -ENOENT;
}
- 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;
@@ -2251,7 +2251,7 @@
#ifndef MODULE
-/* format is: snd-sun-cs4231=snd_index,snd_id,snd_enable */
+/* format is: snd-sun-cs4231=index,id,enable */
static int __init alsa_card_sun_cs4231_setup(char *str)
{
@@ -2259,9 +2259,9 @@
if (nr_dev >= SNDRV_CARDS)
return 0;
- (void)(get_option(&str,&snd_index[nr_dev]) == 2 &&
- get_option(&str,&snd_id[nr_dev]) == 2 &&
- get_id(&str,&snd_enable[nr_dev]) == 2);
+ (void)(get_option(&str,&index[nr_dev]) == 2 &&
+ get_option(&str,&id[nr_dev]) == 2 &&
+ get_id(&str,&enable[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
