Update of /cvsroot/alsa/alsa-kernel/pci
In directory usw-pr-cvs1:/tmp/cvs-serv18246/pci
Modified Files:
als4000.c cmipci.c cs4281.c ens1370.c es1938.c es1968.c
fm801.c intel8x0.c maestro3.c rme32.c rme96.c sonicvibes.c
via82xx.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: als4000.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- als4000.c 13 Aug 2002 16:13:39 -0000 1.16
+++ als4000.c 21 Oct 2002 18:28:23 -0000 1.17
@@ -64,28 +64,28 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{Avance Logic,ALS4000}}");
-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 */
-static int snd_joystick_port[SNDRV_CARDS] =
+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 */
+static int joystick_port[SNDRV_CARDS] =
#ifdef CONFIG_ISA
{0x200}; /* enable as default */
#else
{0}; /* disabled */
#endif
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for ALS4000 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 ALS4000 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 ALS4000 soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_INDEX_DESC);
-MODULE_PARM(snd_joystick_port, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_joystick_port, "Joystick port address for ALS4000 soundcard. (0
= disabled)");
-MODULE_PARM_SYNTAX(snd_joystick_port, SNDRV_ENABLED);
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for ALS4000 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for ALS4000 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable ALS4000 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_INDEX_DESC);
+MODULE_PARM(joystick_port, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(joystick_port, "Joystick port address for ALS4000 soundcard. (0 =
+disabled)");
+MODULE_PARM_SYNTAX(joystick_port, SNDRV_ENABLED);
#define chip_t sb_t
@@ -555,7 +555,7 @@
}
static int __devinit snd_card_als4k_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -569,7 +569,7 @@
if (dev >= SNDRV_CARDS)
return -ENODEV;
- if (!snd_enable[dev]) {
+ if (!enable[dev]) {
dev++;
return -ENOENT;
}
@@ -596,9 +596,9 @@
pci_set_master(pci);
/* disable all legacy ISA stuff except for joystick */
- snd_als4000_set_addr(gcr, 0, 0, 0, snd_joystick_port[dev]);
+ snd_als4000_set_addr(gcr, 0, 0, 0, joystick_port[dev]);
- card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
+ card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof( snd_card_als4000_t ) );
if (card == NULL) {
release_resource(res_gcr_port);
@@ -708,7 +708,7 @@
#ifndef MODULE
-/* format is: snd-als4000=snd_enable,snd_index,snd_id */
+/* format is: snd-als4000=enable,index,id */
static int __init alsa_card_als4000_setup(char *str)
{
@@ -716,9 +716,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;
}
Index: cmipci.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cmipci.c 26 Sep 2002 13:49:42 -0000 1.34
+++ cmipci.c 21 Oct 2002 18:28:23 -0000 1.35
@@ -44,27 +44,27 @@
"{C-Media,CMI8338A},"
"{C-Media,CMI8338B}}");
-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 switches */
-static long snd_mpu_port[SNDRV_CARDS] = {0x330, [1 ... (SNDRV_CARDS-1)]=-1};
-static long snd_fm_port[SNDRV_CARDS] = {0x388, [1 ... (SNDRV_CARDS-1)]=-1};
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for C-Media PCI 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 C-Media PCI 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 C-Media PCI soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_ENABLED
",allows:{{-1},{0x330},{0x320},{0x310},{0x300}},dialog:list");
-MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_fm_port, "FM port.");
-MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_ENABLED
",allows:{{-1},{0x388},{0x3c8},{0x3e0},{0x3e8}},dialog:list");
+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 switches */
+static long mpu_port[SNDRV_CARDS] = {0x330, [1 ... (SNDRV_CARDS-1)]=-1};
+static long fm_port[SNDRV_CARDS] = {0x388, [1 ... (SNDRV_CARDS-1)]=-1};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for C-Media PCI soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for C-Media PCI soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable C-Media PCI soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED
+",allows:{{-1},{0x330},{0x320},{0x310},{0x300}},dialog:list");
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED
+",allows:{{-1},{0x388},{0x3c8},{0x3e0},{0x3e8}},dialog:list");
#ifndef PCI_DEVICE_ID_CMEDIA_CM8738
#define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111
@@ -2678,7 +2678,7 @@
MODULE_DEVICE_TABLE(pci, snd_cmipci_ids);
static int __devinit snd_cmipci_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -2687,12 +2687,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;
@@ -2711,8 +2711,8 @@
}
if ((err = snd_cmipci_create(card, pci,
- snd_mpu_port[dev],
- snd_fm_port[dev],
+ mpu_port[dev],
+ fm_port[dev],
&cm)) < 0) {
snd_card_free(card);
return err;
@@ -2774,8 +2774,8 @@
#ifndef MODULE
-/* format is: snd-cmipci=snd_enable,snd_index,snd_id,
- snd_mpu_port,snd_fm_port */
+/* format is: snd-cmipci=enable,index,id,
+ mpu_port,fm_port */
static int __init alsa_card_cmipci_setup(char *str)
{
@@ -2783,11 +2783,11 @@
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_mpu_port[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_fm_port[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 *)&mpu_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&fm_port[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: cs4281.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cs4281.c 27 Aug 2002 13:47:09 -0000 1.28
+++ cs4281.c 21 Oct 2002 18:28:23 -0000 1.29
@@ -45,23 +45,23 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{Cirrus Logic,CS4281}}");
-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 switches */
-static int snd_dual_codec[SNDRV_CARDS]; /* dual codec */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for CS4281 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 CS4281 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 CS4281 soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_dual_codec, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_dual_codec, "Secondary Codec ID (0 = disabled).");
-MODULE_PARM_SYNTAX(snd_dual_codec, SNDRV_ENABLED ",allows:{{0,3}}");
+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 switches */
+static int dual_codec[SNDRV_CARDS]; /* dual codec */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for CS4281 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for CS4281 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable CS4281 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(dual_codec, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dual_codec, "Secondary Codec ID (0 = disabled).");
+MODULE_PARM_SYNTAX(dual_codec, SNDRV_ENABLED ",allows:{{0,3}}");
/*
*
@@ -1479,7 +1479,7 @@
chip->ba1_addr = pci_resource_start(pci, 1);
pci_set_master(pci);
if (dual_codec < 0 || dual_codec > 3) {
- snd_printk(KERN_ERR "invalid snd_dual_codec option %d\n", dual_codec);
+ snd_printk(KERN_ERR "invalid dual_codec option %d\n", dual_codec);
dual_codec = 0;
}
chip->dual_codec = dual_codec;
@@ -1990,7 +1990,7 @@
static int __devinit snd_cs4281_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -2000,16 +2000,16 @@
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;
- if ((err = snd_cs4281_create(card, pci, &chip, snd_dual_codec[dev])) < 0) {
+ if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) {
snd_card_free(card);
return err;
}
@@ -2253,7 +2253,7 @@
#ifndef MODULE
-/* format is: snd-cs4281=snd_enable,snd_index,snd_id */
+/* format is: snd-cs4281=enable,index,id */
static int __init alsa_card_cs4281_setup(char *str)
{
@@ -2261,9 +2261,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;
}
Index: ens1370.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ens1370.c 14 Oct 2002 13:39:10 -0000 1.23
+++ ens1370.c 21 Oct 2002 18:28:24 -0000 1.24
@@ -63,19 +63,19 @@
"{Ectiva,EV1938}}");
#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 switches */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Ensoniq AudioPCI 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 Ensoniq AudioPCI 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 Ensoniq AudioPCI 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 switches */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Ensoniq AudioPCI soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for Ensoniq AudioPCI soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable Ensoniq AudioPCI soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
#ifndef PCI_DEVICE_ID_ENSONIQ_CT5880
#define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880
@@ -1985,7 +1985,7 @@
}
static int __devinit snd_audiopci_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -1994,12 +1994,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;
@@ -2092,7 +2092,7 @@
#ifndef MODULE
-/* format is: snd-ens1370=snd_enable,snd_index,snd_id */
+/* format is: snd-ens1370=enable,index,id */
static int __init alsa_card_ens137x_setup(char *str)
{
@@ -2100,9 +2100,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;
}
Index: es1938.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1938.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- es1938.c 27 Aug 2002 07:35:48 -0000 1.15
+++ es1938.c 21 Oct 2002 18:28:24 -0000 1.16
@@ -81,19 +81,19 @@
#define PCI_DEVICE_ID_ESS_ES1938 0x1969
#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 ESS Solo-1 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 ESS Solo-1 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 ESS Solo-1 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 ESS Solo-1 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for ESS Solo-1 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable ESS Solo-1 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
#define SLIO_REG(chip, x) ((chip)->io_port + ESSIO_REG_##x)
@@ -1582,7 +1582,7 @@
static int __devinit snd_es1938_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -1593,12 +1593,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;
for (idx = 0; idx < 5; idx++) {
@@ -1701,7 +1701,7 @@
#ifndef MODULE
-/* format is: snd-es1938=snd_enable,snd_index,snd_id */
+/* format is: snd-es1938=enable,index,id */
static int __init alsa_card_es1938_setup(char *str)
{
@@ -1709,9 +1709,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;
}
Index: es1968.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- es1968.c 16 Sep 2002 18:05:43 -0000 1.27
+++ es1968.c 21 Oct 2002 18:28:24 -0000 1.28
@@ -122,35 +122,35 @@
"{ESS,Maestro 1},"
"{TerraTec,DMX}}");
-static int snd_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 1-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 */
-static int snd_total_bufsize[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1024 };
-static int snd_pcm_substreams_p[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4 };
-static int snd_pcm_substreams_c[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
-static int snd_clock[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 " CARD_NAME " 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 " CARD_NAME " 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 " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_total_bufsize, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_total_bufsize, "Total buffer size in kB.");
-MODULE_PARM_SYNTAX(snd_total_bufsize, SNDRV_ENABLED
",allows:{{1,4096}},skill:advanced");
-MODULE_PARM(snd_pcm_substreams_p, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_substreams_p, "PCM Playback substreams for " CARD_NAME "
soundcard.");
-MODULE_PARM_SYNTAX(snd_pcm_substreams_p, SNDRV_ENABLED ",allows:{{1,8}}");
-MODULE_PARM(snd_pcm_substreams_c, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_substreams_c, "PCM Capture substreams for " CARD_NAME "
soundcard.");
-MODULE_PARM_SYNTAX(snd_pcm_substreams_c, SNDRV_ENABLED ",allows:{{0,8}}");
-MODULE_PARM(snd_clock, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_clock, "Clock on " CARD_NAME " soundcard. (0 = auto-detect)");
-MODULE_PARM_SYNTAX(snd_clock, SNDRV_ENABLED);
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 1-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 */
+static int total_bufsize[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1024 };
+static int pcm_substreams_p[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4 };
+static int pcm_substreams_c[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
+static int clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(total_bufsize, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(total_bufsize, "Total buffer size in kB.");
+MODULE_PARM_SYNTAX(total_bufsize, SNDRV_ENABLED ",allows:{{1,4096}},skill:advanced");
+MODULE_PARM(pcm_substreams_p, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_substreams_p, "PCM Playback substreams for " CARD_NAME "
+soundcard.");
+MODULE_PARM_SYNTAX(pcm_substreams_p, SNDRV_ENABLED ",allows:{{1,8}}");
+MODULE_PARM(pcm_substreams_c, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_substreams_c, "PCM Capture substreams for " CARD_NAME "
+soundcard.");
+MODULE_PARM_SYNTAX(pcm_substreams_c, SNDRV_ENABLED ",allows:{{0,8}}");
+MODULE_PARM(clock, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(clock, "Clock on " CARD_NAME " soundcard. (0 = auto-detect)");
+MODULE_PARM_SYNTAX(clock, SNDRV_ENABLED);
/* PCI Dev ID's */
@@ -2667,7 +2667,7 @@
/*
*/
static int __devinit snd_es1968_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -2676,23 +2676,23 @@
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)
return -ENOMEM;
- if (snd_total_bufsize[dev] < 128)
- snd_total_bufsize[dev] = 128;
- if (snd_total_bufsize[dev] > 4096)
- snd_total_bufsize[dev] = 4096;
+ if (total_bufsize[dev] < 128)
+ total_bufsize[dev] = 128;
+ if (total_bufsize[dev] > 4096)
+ total_bufsize[dev] = 4096;
if ((err = snd_es1968_create(card, pci,
- snd_total_bufsize[dev] * 1024, /* in bytes */
- snd_pcm_substreams_p[dev],
- snd_pcm_substreams_c[dev],
+ total_bufsize[dev] * 1024, /* in bytes */
+ pcm_substreams_p[dev],
+ pcm_substreams_c[dev],
&chip)) < 0) {
snd_card_free(card);
return err;
@@ -2738,7 +2738,7 @@
}
}
- chip->clock = snd_clock[dev];
+ chip->clock = clock[dev];
if (! chip->clock)
es1968_measure_clock(chip);
@@ -2817,11 +2817,11 @@
#ifndef MODULE
-/* format is: snd-es1968=snd_enable,snd_index,snd_id,
- snd_total_bufsize,
- snd_pcm_substreams_p,
- snd_pcm_substreams_c,
- snd_clock
+/* format is: snd-es1968=enable,index,id,
+ total_bufsize,
+ pcm_substreams_p,
+ pcm_substreams_c,
+ clock
*/
static int __init alsa_card_es1968_setup(char *str)
@@ -2830,13 +2830,13 @@
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,&snd_total_bufsize[nr_dev]) == 2 &&
- get_option(&str,&snd_pcm_substreams_p[nr_dev]) == 2 &&
- get_option(&str,&snd_pcm_substreams_c[nr_dev]) == 2 &&
- get_option(&str,&snd_clock[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,&total_bufsize[nr_dev]) == 2 &&
+ get_option(&str,&pcm_substreams_p[nr_dev]) == 2 &&
+ get_option(&str,&pcm_substreams_c[nr_dev]) == 2 &&
+ get_option(&str,&clock[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: fm801.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/fm801.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fm801.c 15 Aug 2002 12:13:07 -0000 1.18
+++ fm801.c 21 Oct 2002 18:28:24 -0000 1.19
@@ -42,19 +42,19 @@
MODULE_DEVICES("{{ForteMedia,FM801},"
"{Genius,SoundMaker Live 5.1}}");
-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 the FM801 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 the FM801 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 FM801 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 the FM801 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for the FM801 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable FM801 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
/*
* Direct registers
@@ -1022,7 +1022,7 @@
}
static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -1032,12 +1032,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;
if ((err = snd_fm801_create(card, pci, &chip)) < 0) {
@@ -1120,7 +1120,7 @@
#ifndef MODULE
-/* format is: snd-fm801=snd_enable,snd_index,snd_id */
+/* format is: snd-fm801=enable,index,id */
static int __init alsa_card_fm801_setup(char *str)
{
@@ -1128,9 +1128,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;
}
Index: intel8x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- intel8x0.c 19 Sep 2002 10:35:41 -0000 1.49
+++ intel8x0.c 21 Oct 2002 18:28:24 -0000 1.50
@@ -60,12 +60,12 @@
#define SUPPORT_JOYSTICK 1
#define SUPPORT_MIDI 1
-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 */
-static int snd_ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+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 */
+static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
#ifdef SUPPORT_JOYSTICK
-static int snd_joystick_port[SNDRV_CARDS] =
+static int joystick_port[SNDRV_CARDS] =
#ifdef CONFIG_ISA
{0x200}; /* enable as default */
#else
@@ -73,30 +73,30 @@
#endif
#endif
#ifdef SUPPORT_MIDI
-static int snd_mpu_port[SNDRV_CARDS]; /* disabled */
+static int mpu_port[SNDRV_CARDS]; /* disabled */
#endif
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Intel i8x0 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 Intel i8x0 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 Intel i8x0 soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_ac97_clock, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_ac97_clock, "AC'97 codec clock (0 = auto-detect).");
-MODULE_PARM_SYNTAX(snd_ac97_clock, SNDRV_ENABLED ",default:0");
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Intel i8x0 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for Intel i8x0 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable Intel i8x0 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(ac97_clock, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (0 = auto-detect).");
+MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ",default:0");
#ifdef SUPPORT_JOYSTICK
-MODULE_PARM(snd_joystick_port, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_joystick_port, "Joystick port address for Intel i8x0 soundcard.
(0 = disabled)");
-MODULE_PARM_SYNTAX(snd_joystick_port, SNDRV_ENABLED
",allows:{{0},{0x200}},dialog:list");
+MODULE_PARM(joystick_port, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(joystick_port, "Joystick port address for Intel i8x0 soundcard. (0 =
+disabled)");
+MODULE_PARM_SYNTAX(joystick_port, SNDRV_ENABLED ",allows:{{0},{0x200}},dialog:list");
#endif
#ifdef SUPPORT_MIDI
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_mpu_port, "MPU401 port # for Intel i8x0 driver.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_ENABLED
",allows:{{0},{0x330},{0x300}},dialog:list");
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mpu_port, "MPU401 port # for Intel i8x0 driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_ENABLED
+",allows:{{0},{0x330},{0x300}},dialog:list");
#endif
/*
@@ -2305,7 +2305,7 @@
};
static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -2315,12 +2315,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;
@@ -2333,12 +2333,12 @@
}
}
- if ((err = snd_intel8x0_create(card, pci, id->driver_data, &chip)) < 0) {
+ if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data, &chip)) < 0) {
snd_card_free(card);
return err;
}
- if ((err = snd_intel8x0_mixer(chip, snd_ac97_clock[dev])) < 0) {
+ if ((err = snd_intel8x0_mixer(chip, ac97_clock[dev])) < 0) {
snd_card_free(card);
return err;
}
@@ -2390,20 +2390,20 @@
}
- if (snd_mpu_port[dev] == 0x300 || snd_mpu_port[dev] == 0x330) {
+ if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_INTEL8X0,
- snd_mpu_port[dev], 0,
+ mpu_port[dev], 0,
-1, 0, &chip->rmidi)) < 0) {
- printk(KERN_ERR "intel8x0: no UART401 device at 0x%x,
skipping.\n", snd_mpu_port[dev]);
- snd_mpu_port[dev] = 0;
+ printk(KERN_ERR "intel8x0: no UART401 device at 0x%x,
+skipping.\n", mpu_port[dev]);
+ mpu_port[dev] = 0;
}
} else
- snd_mpu_port[dev] = 0;
+ mpu_port[dev] = 0;
sprintf(card->longname, "%s at 0x%lx, irq %i",
card->shortname, chip->addr, chip->irq);
- if (! snd_ac97_clock[dev])
+ if (! ac97_clock[dev])
intel8x0_measure_ac97_clock(chip);
if ((err = snd_card_register(card)) < 0) {
@@ -2446,24 +2446,24 @@
static int dev;
if (dev >= SNDRV_CARDS)
return -ENODEV;
- if (!snd_enable[dev]) {
+ if (!enable[dev]) {
dev++;
return -ENOENT;
}
- if (snd_joystick_port[dev] > 0 || snd_mpu_port[dev] > 0) {
+ if (joystick_port[dev] > 0 || mpu_port[dev] > 0) {
u16 val;
pci_read_config_word(pci, 0xe6, &val);
- if (snd_joystick_port[dev] > 0)
+ if (joystick_port[dev] > 0)
val |= 0x100;
- if (snd_mpu_port[dev] == 0x300 || snd_mpu_port[dev] == 0x330)
+ if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330)
val |= 0x20;
pci_write_config_word(pci, 0xe6, val | 0x100);
- if (snd_mpu_port[dev] == 0x300 || snd_mpu_port[dev] == 0x330) {
+ if (mpu_port[dev] == 0x300 || mpu_port[dev] == 0x330) {
u8 b;
pci_read_config_byte(pci, 0xe2, &b);
- if (snd_mpu_port[dev] == 0x300)
+ if (mpu_port[dev] == 0x300)
b |= 0x08;
else
b &= ~0x08;
@@ -2522,7 +2522,7 @@
#ifndef MODULE
-/* format is: snd-intel8x0=snd_enable,snd_index,snd_id,snd_ac97_clock */
+/* format is: snd-intel8x0=enable,index,id,ac97_clock */
static int __init alsa_card_intel8x0_setup(char *str)
{
@@ -2530,10 +2530,10 @@
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,&snd_ac97_clock[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,&ac97_clock[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: maestro3.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/maestro3.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- maestro3.c 16 Sep 2002 18:01:53 -0000 1.27
+++ maestro3.c 21 Oct 2002 18:28:24 -0000 1.28
@@ -57,27 +57,27 @@
"{ESS,Allegro-1 PCI},"
"{ESS,Canyon3D-2/LE PCI}}");
-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; /* all enabled */
-static int snd_external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
-static int snd_amp_gpio[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for " CARD_NAME " 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 " CARD_NAME " 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 this soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_external_amp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_external_amp, "Enable external amp for " CARD_NAME "
soundcard.");
-MODULE_PARM_SYNTAX(snd_external_amp, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
-MODULE_PARM(snd_amp_gpio, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_amp_gpio, "GPIO pin number for external amp. (default = -1)");
-MODULE_PARM_SYNTAX(snd_amp_gpio, SNDRV_ENABLED);
+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; /* all enabled */
+static int external_amp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static int amp_gpio[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable this soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(external_amp, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(external_amp, "Enable external amp for " CARD_NAME " soundcard.");
+MODULE_PARM_SYNTAX(external_amp, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
+MODULE_PARM(amp_gpio, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(amp_gpio, "GPIO pin number for external amp. (default = -1)");
+MODULE_PARM_SYNTAX(amp_gpio, SNDRV_ENABLED);
#define MAX_PLAYBACKS 2
#define MAX_CAPTURES 1
@@ -2652,7 +2652,7 @@
/*
*/
static int __devinit
-snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *id)
+snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -2665,12 +2665,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;
@@ -2689,8 +2689,8 @@
}
if ((err = snd_m3_create(card, pci,
- snd_external_amp[dev],
- snd_amp_gpio[dev],
+ external_amp[dev],
+ amp_gpio[dev],
&chip)) < 0) {
snd_card_free(card);
return err;
@@ -2752,7 +2752,7 @@
#ifndef MODULE
-/* format is: snd-maestro3=snd_enable,snd_index,snd_id,snd_external_amp,snd_amp_gpio
*/
+/* format is: snd-maestro3=enable,index,id,external_amp,amp_gpio */
static int __init alsa_card_maestro3_setup(char *str)
{
@@ -2760,11 +2760,11 @@
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,&snd_external_amp[nr_dev]) == 2 &&
- get_option(&str,&snd_amp_gpio[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,&external_amp[nr_dev]) == 2 &&
+ get_option(&str,&_gpio[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: rme32.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme32.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rme32.c 18 Sep 2002 13:23:12 -0000 1.12
+++ rme32.c 21 Oct 2002 18:28:24 -0000 1.13
@@ -41,19 +41,19 @@
#define SNDRV_GET_ID
#include <sound/initval.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 RME Digi32 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 RME Digi32 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 RME Digi32 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 RME Digi32 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for RME Digi32 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable RME Digi32 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
MODULE_AUTHOR("Martin Langer <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("RME Digi32, Digi32/8, Digi32 PRO");
MODULE_LICENSE("GPL");
@@ -1840,7 +1840,7 @@
}
static int __devinit
-snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *id)
+snd_rme32_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
{
static int dev = 0;
rme32_t *rme32;
@@ -1848,7 +1848,7 @@
int err;
for (; dev < SNDRV_CARDS; dev++) {
- if (!snd_enable[dev]) {
+ if (!enable[dev]) {
dev++;
return -ENOENT;
}
@@ -1857,7 +1857,7 @@
if (dev >= SNDRV_CARDS) {
return -ENODEV;
}
- 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(rme32_t))) == NULL)
return -ENOMEM;
card->private_free = snd_rme32_card_free;
@@ -1935,9 +1935,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;
}
Index: rme96.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme96.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rme96.c 15 Aug 2002 12:13:07 -0000 1.16
+++ rme96.c 21 Oct 2002 18:28:24 -0000 1.17
@@ -51,19 +51,19 @@
"{RME,Digi96/8 PST},"
"{RME,Digi96/8 PAD}}");
-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 RME Digi96 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 RME Digi96 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 RME Digi96 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 RME Digi96 soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for RME Digi96 soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
/*
* Defines for RME Digi96 series, from internal RME reference documents
@@ -2411,7 +2411,7 @@
static int __devinit
snd_rme96_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
rme96_t *rme96;
@@ -2422,11 +2422,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(rme96_t))) == NULL)
return -ENOMEM;
card->private_free = snd_rme96_card_free;
@@ -2506,7 +2506,7 @@
#ifndef MODULE
-/* format is: snd-rme96=snd_enable,snd_index,snd_id */
+/* format is: snd-rme96=enable,index,id */
static int __init alsa_card_rme96_setup(char *str)
{
@@ -2514,9 +2514,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;
}
Index: sonicvibes.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/sonicvibes.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sonicvibes.c 15 Aug 2002 12:13:07 -0000 1.16
+++ sonicvibes.c 21 Oct 2002 18:28:25 -0000 1.17
@@ -53,31 +53,31 @@
#define PCI_DEVICE_ID_S3_SONICVIBES 0xca00
#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 */
-static int snd_reverb[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
-static int snd_mge[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
-static unsigned int snd_dmaio = 0x7a00; /* DDMA i/o address */
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for S3 SonicVibes 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 S3 SonicVibes 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 S3 SonicVibes soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_reverb, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_reverb, "Enable reverb (SRAM is present) for S3 SonicVibes
soundcard.");
-MODULE_PARM_SYNTAX(snd_reverb, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_mge, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_mge, "MIC Gain Enable for S3 SonicVibes soundcard.");
-MODULE_PARM_SYNTAX(snd_mge, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_dmaio, "i");
-MODULE_PARM_DESC(snd_dmaio, "DDMA i/o base address for S3 SonicVibes soundcard.");
-MODULE_PARM_SYNTAX(snd_dmaio, "global," SNDRV_PORT_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 */
+static int reverb[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+static int mge[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+static unsigned int dmaio = 0x7a00; /* DDMA i/o address */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for S3 SonicVibes soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for S3 SonicVibes soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable S3 SonicVibes soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(reverb, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(reverb, "Enable reverb (SRAM is present) for S3 SonicVibes
+soundcard.");
+MODULE_PARM_SYNTAX(reverb, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
+MODULE_PARM(mge, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mge, "MIC Gain Enable for S3 SonicVibes soundcard.");
+MODULE_PARM_SYNTAX(mge, SNDRV_ENABLED "," SNDRV_ENABLE_DESC);
+MODULE_PARM(dmaio, "i");
+MODULE_PARM_DESC(dmaio, "DDMA i/o base address for S3 SonicVibes soundcard.");
+MODULE_PARM_SYNTAX(dmaio, "global," SNDRV_PORT_DESC);
/*
* Enhanced port direct registers
@@ -1313,17 +1313,17 @@
pci_read_config_dword(pci, 0x40, &dmaa);
pci_read_config_dword(pci, 0x48, &dmac);
- snd_dmaio &= ~0x0f;
+ dmaio &= ~0x0f;
dmaa &= ~0x0f;
dmac &= ~0x0f;
if (!dmaa) {
- dmaa = snd_dmaio;
- snd_dmaio += 0x10;
+ dmaa = dmaio;
+ dmaio += 0x10;
snd_printk("BIOS did not allocate DDMA channel A i/o, allocated at
0x%x\n", dmaa);
}
if (!dmac) {
- dmac = snd_dmaio;
- snd_dmaio += 0x10;
+ dmac = dmaio;
+ dmaio += 0x10;
snd_printk("BIOS did not allocate DDMA channel C i/o, allocated at
0x%x\n", dmac);
}
pci_write_config_dword(pci, 0x40, dmaa);
@@ -1450,7 +1450,7 @@
}
static int __devinit snd_sonic_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -1461,12 +1461,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;
for (idx = 0; idx < 5; idx++) {
@@ -1477,8 +1477,8 @@
}
}
if ((err = snd_sonicvibes_create(card, pci,
- snd_reverb[dev] ? 1 : 0,
- snd_mge[dev] ? 1 : 0,
+ reverb[dev] ? 1 : 0,
+ mge[dev] ? 1 : 0,
&sonic)) < 0) {
snd_card_free(card);
return err;
@@ -1567,8 +1567,8 @@
#ifndef MODULE
-/* format is: snd-sonicvibes=snd_enable,snd_index,snd_id,
- snd_reverb,snd_mge,snd_dmaio */
+/* format is: snd-sonicvibes=enable,index,id,
+ reverb,mge,dmaio */
static int __init alsa_card_sonicvibes_setup(char *str)
{
@@ -1576,12 +1576,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,&snd_reverb[nr_dev]) == 2 &&
- get_option(&str,&snd_mge[nr_dev]) == 2 &&
- get_option(&str,(int *)&snd_dmaio) == 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,&reverb[nr_dev]) == 2 &&
+ get_option(&str,&mge[nr_dev]) == 2 &&
+ get_option(&str,(int *)&dmaio) == 2);
nr_dev++;
return 1;
}
Index: via82xx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- via82xx.c 20 Sep 2002 11:50:06 -0000 1.9
+++ via82xx.c 21 Oct 2002 18:28:25 -0000 1.10
@@ -46,27 +46,27 @@
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{VIA,VT82C686A/B/C,pci},{VIA,VT8233A/B/C}}");
-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 */
-static long snd_mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
-static int snd_ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 48000};
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for VIA 82xx bridge.");
-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 VIA 82xx bridge.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_enable, "Enable audio part of VIA 82xx bridge.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port.");
-MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_PORT_DESC);
-MODULE_PARM(snd_ac97_clock, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_ac97_clock, "AC'97 codec clock (default 48000Hz).");
-MODULE_PARM_SYNTAX(snd_ac97_clock, SNDRV_ENABLED ",default:48000");
+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 */
+static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
+static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 48000};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for VIA 82xx bridge.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for VIA 82xx bridge.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable audio part of VIA 82xx bridge.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_PORT_DESC);
+MODULE_PARM(ac97_clock, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
+MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ",default:48000");
/* pci ids */
@@ -1168,7 +1168,7 @@
}
static int __devinit snd_via82xx_probe(struct pci_dev *pci,
- const struct pci_device_id *id)
+ const struct pci_device_id *pci_id)
{
static int dev;
snd_card_t *card;
@@ -1179,16 +1179,16 @@
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;
- chip_type = id->driver_data;
+ chip_type = pci_id->driver_data;
switch (chip_type) {
case TYPE_VIA686:
strcpy(card->driver, "VIA686A");
@@ -1204,7 +1204,7 @@
return -EINVAL;
}
- if ((err = snd_via82xx_create(card, pci, chip_type, snd_ac97_clock[dev],
&chip)) < 0) {
+ if ((err = snd_via82xx_create(card, pci, chip_type, ac97_clock[dev], &chip)) <
+0) {
snd_card_free(card);
return err;
}
@@ -1243,44 +1243,44 @@
}
pci_write_config_byte(pci, 0x42, legacy);
pci_write_config_byte(pci, 0x43, legacy_cfg);
- if (rev_h && snd_mpu_port[dev] >= 0x200) { /* force MIDI */
+ if (rev_h && mpu_port[dev] >= 0x200) { /* force MIDI */
legacy |= 0x02; /* enable MPU */
- pci_write_config_dword(pci, 0x18, (snd_mpu_port[dev] & 0xfffc)
| 0x01);
+ pci_write_config_dword(pci, 0x18, (mpu_port[dev] & 0xfffc) |
+0x01);
} else {
if (rev_h && (legacy & 0x02)) {
- snd_mpu_port[dev] = pci_resource_start(pci, 2);
- if (snd_mpu_port[dev] < 0x200) /* bad value */
+ mpu_port[dev] = pci_resource_start(pci, 2);
+ if (mpu_port[dev] < 0x200) /* bad value */
legacy &= ~0x02; /* disable MIDI */
} else {
- switch (snd_mpu_port[dev]) { /* force MIDI */
+ switch (mpu_port[dev]) { /* force MIDI */
case 0x300:
case 0x310:
case 0x320:
case 0x330:
legacy_cfg &= ~(3 << 2);
- legacy_cfg |= (snd_mpu_port[dev] & 0x0030) >>
2;
+ legacy_cfg |= (mpu_port[dev] & 0x0030) >> 2;
legacy |= 0x02;
break;
default: /* no, use BIOS
settings */
if (legacy & 0x02)
- snd_mpu_port[dev] = 0x300 +
((legacy_cfg & 0x000c) << 2);
+ mpu_port[dev] = 0x300 + ((legacy_cfg &
+0x000c) << 2);
}
}
}
pci_write_config_byte(pci, 0x42, legacy);
pci_write_config_byte(pci, 0x43, legacy_cfg);
if (legacy & 0x02) {
- if (check_region(snd_mpu_port[dev], 2)) {
- printk(KERN_WARNING "unable to get MPU-401 port at
0x%lx, skipping\n", snd_mpu_port[dev]);
+ if (check_region(mpu_port[dev], 2)) {
+ printk(KERN_WARNING "unable to get MPU-401 port at
+0x%lx, skipping\n", mpu_port[dev]);
legacy &= ~0x02;
pci_write_config_byte(pci, 0x42, legacy);
goto __skip_mpu;
}
if (snd_mpu401_uart_new(card, 0, MPU401_HW_VIA686A,
- snd_mpu_port[dev], 0,
+ mpu_port[dev], 0,
pci->irq, 0,
&chip->rmidi) < 0) {
- printk(KERN_WARNING "unable to initialize MPU-401 at
0x%lx, skipping\n", snd_mpu_port[dev]);
+ printk(KERN_WARNING "unable to initialize MPU-401 at
+0x%lx, skipping\n", mpu_port[dev]);
legacy &= ~0x02;
pci_write_config_byte(pci, 0x42, legacy);
goto __skip_mpu;
@@ -1355,8 +1355,8 @@
#ifndef MODULE
-/* format is: snd-via82xx=snd_enable,snd_index,snd_id,
- snd_mpu_port,snd_ac97_clock */
+/* format is: snd-via82xx=enable,index,id,
+ mpu_port,ac97_clock */
static int __init alsa_card_via82xx_setup(char *str)
{
@@ -1364,11 +1364,11 @@
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_mpu_port[nr_dev]) == 2 &&
- get_option(&str,&snd_ac97_clock[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 *)&mpu_port[nr_dev]) == 2 &&
+ get_option(&str,&ac97_clock[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
