Update of /cvsroot/alsa/alsa-kernel/pci/korg1212
In directory usw-pr-cvs1:/tmp/cvs-serv18246/pci/korg1212
Modified Files:
korg1212.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: korg1212.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/korg1212/korg1212.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- korg1212.c 15 Aug 2002 12:13:09 -0000 1.19
+++ korg1212.c 21 Oct 2002 18:28:25 -0000 1.20
@@ -387,19 +387,19 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{KORG,korg1212}}");
-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 */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Korg 1212 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 Korg 1212 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 Korg 1212 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; /* Enable this card */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Korg 1212 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for Korg 1212 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable Korg 1212 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
MODULE_AUTHOR("Haroldo Gamal <[EMAIL PROTECTED]>");
static struct pci_device_id snd_korg1212_ids[] __devinitdata = {
@@ -2252,7 +2252,7 @@
static int __devinit
snd_korg1212_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
korg1212_t *korg1212;
@@ -2262,11 +2262,11 @@
if (dev >= SNDRV_CARDS) {
return -ENODEV;
}
- if (!snd_enable[dev]) {
+ if (!enable[dev]) {
dev++;
return -ENOENT;
}
- 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(korg1212_t))) == NULL)
return -ENOMEM;
@@ -2334,7 +2334,7 @@
#ifndef MODULE
-/* format is: snd-korg1212=snd_enable,snd_index,snd_id */
+/* format is: snd-korg1212=enable,index,id */
static int __init alsa_card_korg1212_setup(char *str)
{
@@ -2342,9 +2342,9 @@
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);
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
