Update of /cvsroot/alsa/alsa-kernel/drivers
In directory usw-pr-cvs1:/tmp/cvs-serv18246/drivers
Modified Files:
dummy.c mtpav.c serial-u16550.c virmidi.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: dummy.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/drivers/dummy.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dummy.c 9 Sep 2002 09:03:01 -0000 1.12
+++ dummy.c 21 Oct 2002 18:28:20 -0000 1.13
@@ -84,31 +84,31 @@
#define USE_PERIODS_MAX 1024
#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] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
-static int snd_pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
-static int snd_pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8};
-//static int snd_midi_devs[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 dummy 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 dummy 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 dummy soundcard.");
-MODULE_PARM_SYNTAX(snd_enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(snd_pcm_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_devs, "PCM devices # (0-4) for dummy driver.");
-MODULE_PARM_SYNTAX(snd_pcm_devs, SNDRV_ENABLED
",allows:{{0,4}},default:1,dialog:list");
-MODULE_PARM(snd_pcm_substreams, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_pcm_substreams, "PCM substreams # (1-16) for dummy driver.");
-MODULE_PARM_SYNTAX(snd_pcm_substreams, SNDRV_ENABLED
",allows:{{1,16}},default:8,dialog:list");
-//MODULE_PARM(snd_midi_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-//MODULE_PARM_DESC(snd_midi_devs, "MIDI devices # (0-2) for dummy driver.");
-//MODULE_PARM_SYNTAX(snd_midi_devs, SNDRV_ENABLED
",allows:{{0,2}},default:8,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] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int pcm_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static int pcm_substreams[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8};
+//static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for dummy soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for dummy soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable this dummy soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(pcm_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_devs, "PCM devices # (0-4) for dummy driver.");
+MODULE_PARM_SYNTAX(pcm_devs, SNDRV_ENABLED ",allows:{{0,4}},default:1,dialog:list");
+MODULE_PARM(pcm_substreams, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-16) for dummy driver.");
+MODULE_PARM_SYNTAX(pcm_substreams, SNDRV_ENABLED
+",allows:{{1,16}},default:8,dialog:list");
+//MODULE_PARM(midi_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//MODULE_PARM_DESC(midi_devs, "MIDI devices # (0-2) for dummy driver.");
+//MODULE_PARM_SYNTAX(midi_devs, SNDRV_ENABLED
+",allows:{{0,2}},default:8,dialog:list");
#define MIXER_ADDR_MASTER 0
#define MIXER_ADDR_LINE 1
@@ -537,20 +537,20 @@
struct snd_card_dummy *dummy;
int idx, err;
- if (!snd_enable[dev])
+ if (!enable[dev])
return -ENODEV;
- 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_card_dummy));
if (card == NULL)
return -ENOMEM;
dummy = (struct snd_card_dummy *)card->private_data;
dummy->card = card;
- for (idx = 0; idx < MAX_PCM_DEVICES && idx < snd_pcm_devs[dev]; idx++) {
- if (snd_pcm_substreams[dev] < 1)
- snd_pcm_substreams[dev] = 1;
- if (snd_pcm_substreams[dev] > MAX_PCM_SUBSTREAMS)
- snd_pcm_substreams[dev] = MAX_PCM_SUBSTREAMS;
- if ((err = snd_card_dummy_pcm(dummy, idx, snd_pcm_substreams[dev])) <
0)
+ for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) {
+ if (pcm_substreams[dev] < 1)
+ pcm_substreams[dev] = 1;
+ if (pcm_substreams[dev] > MAX_PCM_SUBSTREAMS)
+ pcm_substreams[dev] = MAX_PCM_SUBSTREAMS;
+ if ((err = snd_card_dummy_pcm(dummy, idx, pcm_substreams[dev])) < 0)
goto __nodev;
}
if ((err = snd_card_dummy_new_mixer(dummy)) < 0)
@@ -571,7 +571,7 @@
{
int dev, cards;
- for (dev = cards = 0; dev < SNDRV_CARDS && snd_enable[dev]; dev++) {
+ for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev]; dev++) {
if (snd_card_dummy_probe(dev) < 0) {
#ifdef MODULE
printk(KERN_ERR "Dummy soundcard #%i not found or device
busy\n", dev + 1);
@@ -602,8 +602,8 @@
#ifndef MODULE
-/* format is: snd-dummy=snd_enable,snd_index,snd_id,
- snd_pcm_devs,snd_pcm_substreams */
+/* format is: snd-dummy=enable,index,id,
+ pcm_devs,pcm_substreams */
static int __init alsa_card_dummy_setup(char *str)
{
@@ -611,11 +611,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_pcm_devs[nr_dev]) == 2 &&
- get_option(&str,&snd_pcm_substreams[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,&pcm_devs[nr_dev]) == 2 &&
+ get_option(&str,&pcm_substreams[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: mtpav.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/drivers/mtpav.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mtpav.c 21 Oct 2002 11:16:02 -0000 1.15
+++ mtpav.c 21 Oct 2002 18:28:20 -0000 1.16
@@ -44,7 +44,7 @@
* Jun 11 2001 Takashi Iwai <[EMAIL PROTECTED]>
* - Recoded & debugged
* - Added timer interrupt for midi outputs
- * - snd_hwports is between 1 and 8, which specifies the number of hardware
ports.
+ * - hwports is between 1 and 8, which specifies the number of hardware ports.
* The three global ports, computer, adat and broadcast ports, are created
* always after h/w and remote ports.
*
@@ -75,27 +75,27 @@
#define MTPAV_IRQ 7
#define MTPAV_MAX_PORTS 8
-static int snd_index = SNDRV_DEFAULT_IDX1;
-static char *snd_id = SNDRV_DEFAULT_STR1;
-static long snd_port = MTPAV_IOBASE; /* 0x378, 0x278 */
-static int snd_irq = MTPAV_IRQ; /* 7, 5 */
-static int snd_hwports = MTPAV_MAX_PORTS; /* use hardware ports 1-8 */
-
-MODULE_PARM(snd_index, "i");
-MODULE_PARM_DESC(snd_index, "Index value for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_index, SNDRV_INDEX_DESC);
-MODULE_PARM(snd_id, "s");
-MODULE_PARM_DESC(snd_id, "ID string for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_port, "l");
-MODULE_PARM_DESC(snd_port, "Parallel port # for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_ENABLED ",allows:{{0x378},{0x278}},dialog:list");
-MODULE_PARM(snd_irq, "i");
-MODULE_PARM_DESC(snd_irq, "Parallel IRQ # for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_ENABLED ",allows:{{7},{5}},dialog:list");
-MODULE_PARM(snd_hwports, "i");
-MODULE_PARM_DESC(snd_hwports, "Hardware ports # for MotuMTPAV MIDI.");
-MODULE_PARM_SYNTAX(snd_hwports, SNDRV_ENABLED ",allows:{{1,8}},dialog:list");
+static int index = SNDRV_DEFAULT_IDX1;
+static char *id = SNDRV_DEFAULT_STR1;
+static long port = MTPAV_IOBASE; /* 0x378, 0x278 */
+static int irq = MTPAV_IRQ; /* 7, 5 */
+static int hwports = MTPAV_MAX_PORTS; /* use hardware ports 1-8 */
+
+MODULE_PARM(index, "i");
+MODULE_PARM_DESC(index, "Index value for MotuMTPAV MIDI.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "s");
+MODULE_PARM_DESC(id, "ID string for MotuMTPAV MIDI.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(port, "l");
+MODULE_PARM_DESC(port, "Parallel port # for MotuMTPAV MIDI.");
+MODULE_PARM_SYNTAX(port, SNDRV_ENABLED ",allows:{{0x378},{0x278}},dialog:list");
+MODULE_PARM(irq, "i");
+MODULE_PARM_DESC(irq, "Parallel IRQ # for MotuMTPAV MIDI.");
+MODULE_PARM_SYNTAX(irq, SNDRV_ENABLED ",allows:{{7},{5}},dialog:list");
+MODULE_PARM(hwports, "i");
+MODULE_PARM_DESC(hwports, "Hardware ports # for MotuMTPAV MIDI.");
+MODULE_PARM_SYNTAX(hwports, SNDRV_ENABLED ",allows:{{1,8}},dialog:list");
/*
* defines
@@ -585,16 +585,16 @@
*/
static int snd_mtpav_get_ISA(mtpav_t * mcard)
{
- if ((mcard->res_port = request_region(snd_port, 3, "MotuMTPAV MIDI")) == NULL)
{
- snd_printk("MTVAP port 0x%lx is busy\n", snd_port);
+ if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
+ snd_printk("MTVAP port 0x%lx is busy\n", port);
return -EBUSY;
}
- mcard->port = snd_port;
- if (request_irq(snd_irq, snd_mtpav_irqh, SA_INTERRUPT, "MOTU MTPAV", (void
*)mcard)) {
- snd_printk("MTVAP IRQ %d busy\n", snd_irq);
+ mcard->port = port;
+ if (request_irq(irq, snd_mtpav_irqh, SA_INTERRUPT, "MOTU MTPAV", (void
+*)mcard)) {
+ snd_printk("MTVAP IRQ %d busy\n", irq);
return -EBUSY;
}
- mcard->irq = snd_irq;
+ mcard->irq = irq;
return 0;
}
@@ -642,12 +642,12 @@
//printk("entering snd_mtpav_get_RAWMIDI\n");
- if (snd_hwports < 1)
+ if (hwports < 1)
mcard->num_ports = 1;
- else if (snd_hwports > 8)
+ else if (hwports > 8)
mcard->num_ports = 8;
else
- mcard->num_ports = snd_hwports;
+ mcard->num_ports = hwports;
if ((rval = snd_rawmidi_new(mcard->card, "MotuMIDI", 0,
mcard->num_ports * 2 + MTPAV_PIDX_BROADCAST + 1,
@@ -727,7 +727,7 @@
if (mtp_card == NULL)
return -ENOMEM;
- mtp_card->card = snd_card_new(snd_index, snd_id, THIS_MODULE, 0);
+ mtp_card->card = snd_card_new(index, id, THIS_MODULE, 0);
if (mtp_card->card == NULL) {
free_mtpav(mtp_card);
return -ENOMEM;
@@ -757,7 +757,7 @@
snd_mtpav_portscan(mtp_card);
- printk(KERN_INFO "Motu MidiTimePiece on parallel port irq: %d ioport:
0x%lx\n", snd_irq, snd_port);
+ printk(KERN_INFO "Motu MidiTimePiece on parallel port irq: %d ioport:
+0x%lx\n", irq, port);
return 0;
@@ -787,19 +787,19 @@
#ifndef MODULE
-/* format is: snd-mtpav=snd_enable,snd_index,snd_id,
- snd_port,snd_irq,snd_hwports */
+/* format is: snd-mtpav=snd_enable,index,id,
+ port,irq,hwports */
static int __init alsa_card_mtpav_setup(char *str)
{
int __attribute__ ((__unused__)) enable = 1;
(void)(get_option(&str,&enable) == 2 &&
- get_option(&str,&snd_index) == 2 &&
- get_id(&str,&snd_id) == 2 &&
- get_option(&str,(int *)&snd_port) == 2 &&
- get_option(&str,&snd_irq) == 2 &&
- get_option(&str,&snd_hwports) == 2);
+ get_option(&str,&index) == 2 &&
+ get_id(&str,&id) == 2 &&
+ get_option(&str,(int *)&port) == 2 &&
+ get_option(&str,&irq) == 2 &&
+ get_option(&str,&hwports) == 2);
return 1;
}
Index: serial-u16550.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/drivers/serial-u16550.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- serial-u16550.c 13 Aug 2002 16:13:35 -0000 1.15
+++ serial-u16550.c 21 Oct 2002 18:28:20 -0000 1.16
@@ -61,48 +61,48 @@
"Generic"
};
-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; /* 0x3f8,0x2f8,0x3e8,0x2e8 */
-static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 3,4,5,7,9,10,11,14,15 */
-static int snd_speed[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 38400}; /*
9600,19200,38400,57600,115200 */
-static int snd_base[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 115200}; /* baud base
*/
-static int snd_outs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; /* 1 to 16 */
-static int snd_ins[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; /* 1 to 16 */
-static int snd_adaptor[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] =
SNDRV_SERIAL_SOUNDCANVAS};
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for Serial MIDI.");
-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 Serial MIDI.");
-MODULE_PARM_SYNTAX(snd_id, SNDRV_ID_DESC);
-MODULE_PARM(snd_enable, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
-MODULE_PARM_DESC(snd_enable, "Enable UART16550A chip.");
-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 UART16550A chip.");
-MODULE_PARM_SYNTAX(snd_port, SNDRV_PORT12_DESC);
-MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_irq, "IRQ # for UART16550A chip.");
-MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
-MODULE_PARM(snd_speed, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_speed, "Speed in bauds.");
-MODULE_PARM_SYNTAX(snd_speed, SNDRV_ENABLED
",allows:{9600,19200,38400,57600,115200},dialog:list");
-MODULE_PARM(snd_base, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_base, "Base for divisor in bauds.");
-MODULE_PARM_SYNTAX(snd_base, SNDRV_ENABLED
",allows:{57600,115200,230400,460800},dialog:list");
-MODULE_PARM(snd_outs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_outs, "Number of MIDI outputs.");
-MODULE_PARM(snd_ins, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_ins, "Number of MIDI inputs.");
-
-MODULE_PARM_SYNTAX(snd_outs, SNDRV_ENABLED ",allows:{{1,16}},dialog:list");
-MODULE_PARM_SYNTAX(snd_ins, SNDRV_ENABLED ",allows:{{1,16}},dialog:list");
-MODULE_PARM(snd_adaptor, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_adaptor, "Type of adaptor.");
-MODULE_PARM_SYNTAX(snd_adaptor, SNDRV_ENABLED
",allows:{{0=Soundcanvas,1=MS-124T,2=MS-124W S/A,3=MS-124W
M/B,4=Generic}},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; /* Enable this card */
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x3f8,0x2f8,0x3e8,0x2e8 */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 3,4,5,7,9,10,11,14,15 */
+static int speed[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 38400}; /*
+9600,19200,38400,57600,115200 */
+static int base[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 115200}; /* baud base */
+static int outs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; /* 1 to 16 */
+static int ins[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; /* 1 to 16 */
+static int adaptor[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] =
+SNDRV_SERIAL_SOUNDCANVAS};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for Serial MIDI.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for Serial MIDI.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(enable, "Enable UART16550A chip.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for UART16550A chip.");
+MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for UART16550A chip.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(speed, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(speed, "Speed in bauds.");
+MODULE_PARM_SYNTAX(speed, SNDRV_ENABLED
+",allows:{9600,19200,38400,57600,115200},dialog:list");
+MODULE_PARM(base, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(base, "Base for divisor in bauds.");
+MODULE_PARM_SYNTAX(base, SNDRV_ENABLED
+",allows:{57600,115200,230400,460800},dialog:list");
+MODULE_PARM(outs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(outs, "Number of MIDI outputs.");
+MODULE_PARM(ins, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(ins, "Number of MIDI inputs.");
+
+MODULE_PARM_SYNTAX(outs, SNDRV_ENABLED ",allows:{{1,16}},dialog:list");
+MODULE_PARM_SYNTAX(ins, SNDRV_ENABLED ",allows:{{1,16}},dialog:list");
+MODULE_PARM(adaptor, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(adaptor, "Type of adaptor.");
+MODULE_PARM_SYNTAX(adaptor, SNDRV_ENABLED
+",allows:{{0=Soundcanvas,1=MS-124T,2=MS-124W S/A,3=MS-124W
+M/B,4=Generic}},dialog:list");
/*#define SNDRV_SERIAL_MS124W_MB_NOCOMBO 1*/ /* Address outs as 0-3 instead of
bitmap */
@@ -842,67 +842,67 @@
snd_uart16550_t *uart;
int err;
- if (!snd_enable[dev])
+ if (!enable[dev])
return -ENOENT;
- switch (snd_adaptor[dev]) {
+ switch (adaptor[dev]) {
case SNDRV_SERIAL_SOUNDCANVAS:
- snd_ins[dev] = 1;
+ ins[dev] = 1;
break;
case SNDRV_SERIAL_MS124T:
case SNDRV_SERIAL_MS124W_SA:
- snd_outs[dev] = 1;
- snd_ins[dev] = 1;
+ outs[dev] = 1;
+ ins[dev] = 1;
break;
case SNDRV_SERIAL_MS124W_MB:
- snd_outs[dev] = 16;
- snd_ins[dev] = 1;
+ outs[dev] = 16;
+ ins[dev] = 1;
break;
case SNDRV_SERIAL_GENERIC:
break;
default:
snd_printk("Adaptor type is out of range 0-%d (%d)\n",
- SNDRV_SERIAL_MAX_ADAPTOR, snd_adaptor[dev]);
+ SNDRV_SERIAL_MAX_ADAPTOR, adaptor[dev]);
return -ENODEV;
}
- if (snd_outs[dev] < 1 || snd_outs[dev] > SNDRV_SERIAL_MAX_OUTS) {
+ if (outs[dev] < 1 || outs[dev] > SNDRV_SERIAL_MAX_OUTS) {
snd_printk("Count of outputs is out of range 1-%d (%d)\n",
- SNDRV_SERIAL_MAX_OUTS, snd_outs[dev]);
+ SNDRV_SERIAL_MAX_OUTS, outs[dev]);
return -ENODEV;
}
- if (snd_ins[dev] < 1 || snd_ins[dev] > SNDRV_SERIAL_MAX_INS) {
+ if (ins[dev] < 1 || ins[dev] > SNDRV_SERIAL_MAX_INS) {
snd_printk("Count of inputs is out of range 1-%d (%d)\n",
- SNDRV_SERIAL_MAX_INS, snd_ins[dev]);
+ SNDRV_SERIAL_MAX_INS, ins[dev]);
return -ENODEV;
}
- 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;
strcpy(card->driver, "Serial");
strcpy(card->shortname, "Serial midi (uart16550A)");
- if ((err = snd_uart16550_detect(snd_port[dev])) <= 0) {
+ if ((err = snd_uart16550_detect(port[dev])) <= 0) {
snd_card_free(card);
- printk(KERN_ERR "no UART detected at 0x%lx\n", (long)snd_port[dev]);
+ printk(KERN_ERR "no UART detected at 0x%lx\n", (long)port[dev]);
return err;
}
if ((err = snd_uart16550_create(card,
- snd_port[dev],
- snd_irq[dev],
- snd_speed[dev],
- snd_base[dev],
- snd_adaptor[dev],
+ port[dev],
+ irq[dev],
+ speed[dev],
+ base[dev],
+ adaptor[dev],
&uart)) < 0) {
snd_card_free(card);
return err;
}
- if ((err = snd_uart16550_rmidi(uart, 0, snd_outs[dev], snd_ins[dev],
&uart->rmidi)) < 0) {
+ if ((err = snd_uart16550_rmidi(uart, 0, outs[dev], ins[dev], &uart->rmidi)) <
+0) {
snd_card_free(card);
return err;
}
@@ -913,8 +913,8 @@
uart->irq,
uart->speed,
(int)uart->divisor,
- snd_outs[dev],
- snd_ins[dev],
+ outs[dev],
+ ins[dev],
adaptor_names[uart->adaptor]);
if ((err = snd_card_register(card)) < 0) {
@@ -959,9 +959,9 @@
#ifndef MODULE
-/* format is: snd-serial=snd_enable,snd_index,snd_id,
- snd_port,snd_irq,snd_speed,snd_base,snd_outs,
- snd_ins,snd_adaptor */
+/* format is: snd-serial=enable,index,id,
+ port,irq,speed,base,outs,
+ ins,adaptor */
static int __init alsa_card_serial_setup(char *str)
{
@@ -969,16 +969,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_speed[nr_dev]) == 2 &&
- get_option(&str,&snd_base[nr_dev]) == 2 &&
- get_option(&str,&snd_outs[nr_dev]) == 2 &&
- get_option(&str,&snd_ins[nr_dev]) == 2 &&
- get_option(&str,&snd_adaptor[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,&speed[nr_dev]) == 2 &&
+ get_option(&str,&base[nr_dev]) == 2 &&
+ get_option(&str,&outs[nr_dev]) == 2 &&
+ get_option(&str,&ins[nr_dev]) == 2 &&
+ get_option(&str,&adaptor[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: virmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/drivers/virmidi.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- virmidi.c 25 May 2002 10:26:07 -0000 1.9
+++ virmidi.c 21 Oct 2002 18:28:21 -0000 1.10
@@ -30,7 +30,7 @@
*
* Typical usage is like following:
* - Load snd-virmidi module.
- * # modprobe snd-virmidi snd_index=2
+ * # modprobe snd-virmidi index=2
* Then, sequencer clients 72:0 to 75:0 will be created, which are
* mapped from /dev/snd/midiC1D0 to /dev/snd/midiC1D3, respectively.
*
@@ -59,23 +59,23 @@
#define MAX_MIDI_DEVICES 8
-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] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
-static int snd_midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
-
-MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_index, "Index value for virmidi 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 virmidi 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_midi_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_midi_devs, "MIDI devices # (1-8)");
-MODULE_PARM_SYNTAX(snd_midi_devs, SNDRV_ENABLED ",allows:{{1,8}}");
+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] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for virmidi soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for virmidi 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(midi_devs, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(midi_devs, "MIDI devices # (1-8)");
+MODULE_PARM_SYNTAX(midi_devs, SNDRV_ENABLED ",allows:{{1,8}}");
typedef struct snd_card_virmidi {
snd_card_t *card;
@@ -91,20 +91,20 @@
struct snd_card_virmidi *vmidi;
int idx, err;
- if (!snd_enable[dev])
+ if (!enable[dev])
return -ENODEV;
- 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_card_virmidi));
if (card == NULL)
return -ENOMEM;
vmidi = (struct snd_card_virmidi *)card->private_data;
vmidi->card = card;
- if (snd_midi_devs[dev] > MAX_MIDI_DEVICES) {
+ if (midi_devs[dev] > MAX_MIDI_DEVICES) {
snd_printk("too much midi devices for virmidi %d: force to use %d\n",
dev, MAX_MIDI_DEVICES);
- snd_midi_devs[dev] = MAX_MIDI_DEVICES;
+ midi_devs[dev] = MAX_MIDI_DEVICES;
}
- for (idx = 0; idx < snd_midi_devs[dev]; idx++) {
+ for (idx = 0; idx < midi_devs[dev]; idx++) {
snd_rawmidi_t *rmidi;
snd_virmidi_dev_t *rdev;
if ((err = snd_virmidi_new(card, idx, &rmidi)) < 0)
@@ -131,7 +131,7 @@
{
int dev, cards;
- for (dev = cards = 0; dev < SNDRV_CARDS && snd_enable[dev]; dev++) {
+ for (dev = cards = 0; dev < SNDRV_CARDS && enable[dev]; dev++) {
if (snd_card_virmidi_probe(dev) < 0) {
#ifdef MODULE
printk(KERN_ERR "Card-VirMIDI #%i not found or device busy\n",
dev + 1);
@@ -162,7 +162,7 @@
#ifndef MODULE
-/* format is: snd-virmidi=snd_enable,snd_index,snd_id,snd_midi_devs */
+/* format is: snd-virmidi=enable,index,id,midi_devs */
static int __init alsa_card_virmidi_setup(char *str)
{
@@ -170,10 +170,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_midi_devs[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,&midi_devs[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
