Update of /cvsroot/alsa/alsa-kernel/ppc
In directory usw-pr-cvs1:/tmp/cvs-serv18246/ppc
Modified Files:
powermac.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: powermac.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/ppc/powermac.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- powermac.c 27 Aug 2002 13:46:15 -0000 1.10
+++ powermac.c 21 Oct 2002 18:28:26 -0000 1.11
@@ -34,23 +34,23 @@
MODULE_DEVICES("{{Apple,PowerMac}}");
MODULE_LICENSE("GPL");
-static int snd_index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
-static char *snd_id = SNDRV_DEFAULT_STR1; /* ID for this card */
-static int snd_enable = 1;
-static int snd_enable_beep = 1;
-
-MODULE_PARM(snd_index, "i");
-MODULE_PARM_DESC(snd_index, "Index value for " CHIP_NAME " soundchip.");
-MODULE_PARM_SYNTAX(snd_index, SNDRV_INDEX_DESC);
-MODULE_PARM(snd_id, "s");
-MODULE_PARM_DESC(snd_id, "ID string for " CHIP_NAME " soundchip.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_enable, "i");
-MODULE_PARM_DESC(snd_enable, "Enable this soundchip.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_enable_beep, "i");
-MODULE_PARM_DESC(snd_enable_beep, "Enable beep using PCM.");
-MODULE_PARM_SYNTAX(snd_enable_beep, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
+static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */
+static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */
+static int enable = 1;
+static int enable_beep = 1;
+
+MODULE_PARM(index, "i");
+MODULE_PARM_DESC(index, "Index value for " CHIP_NAME " soundchip.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "s");
+MODULE_PARM_DESC(id, "ID string for " CHIP_NAME " soundchip.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "i");
+MODULE_PARM_DESC(enable, "Enable this soundchip.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(enable_beep, "i");
+MODULE_PARM_DESC(enable_beep, "Enable beep using PCM.");
+MODULE_PARM_SYNTAX(enable_beep, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
/*
@@ -69,7 +69,7 @@
char *name_ext;
int err;
- card = snd_card_new(snd_index, snd_id, THIS_MODULE, 0);
+ card = snd_card_new(index, id, THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
@@ -129,7 +129,7 @@
goto __error;
chip->initialized = 1;
- if (snd_enable_beep)
+ if (enable_beep)
snd_pmac_attach_beep(chip);
if ((err = snd_card_register(card)) < 0)
@@ -172,15 +172,15 @@
#ifndef MODULE
-/* format is: snd-pmac=snd_enable,snd_index,snd_id,snd_enable_beep
+/* format is: snd-pmac=enable,index,id,enable_beep
*/
static int __init alsa_card_pmac_setup(char *str)
{
- (void)(get_option(&str,&snd_enable) == 2 &&
- get_option(&str,&snd_index) == 2 &&
- get_id(&str,&snd_id) == 2 &&
- get_option(&str,&snd_enable_beep) == 2
+ (void)(get_option(&str,&enable) == 2 &&
+ get_option(&str,&index) == 2 &&
+ get_id(&str,&id) == 2 &&
+ get_option(&str,&enable_beep) == 2
);
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
