Update of /cvsroot/alsa/alsa-kernel/core
In directory usw-pr-cvs1:/tmp/cvs-serv18246/core
Modified Files:
pcm_memory.c rawmidi.c sound.c timer.c
Log Message:
Changed module option names: snd_xxxx ==> xxxx
Index: pcm_memory.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_memory.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pcm_memory.c 12 Aug 2002 08:43:45 -0000 1.12
+++ pcm_memory.c 21 Oct 2002 18:28:20 -0000 1.13
@@ -27,15 +27,15 @@
#include <sound/info.h>
#include <sound/initval.h>
-static int snd_preallocate_dma = 1;
-MODULE_PARM(snd_preallocate_dma, "i");
-MODULE_PARM_DESC(snd_preallocate_dma, "Preallocate DMA memory when the PCM devices
are initialized.");
-MODULE_PARM_SYNTAX(snd_preallocate_dma, SNDRV_BOOLEAN_TRUE_DESC);
-
-static int snd_maximum_substreams = 4;
-MODULE_PARM(snd_maximum_substreams, "i");
-MODULE_PARM_DESC(snd_maximum_substreams, "Maximum substreams with preallocated DMA
memory.");
-MODULE_PARM_SYNTAX(snd_maximum_substreams, SNDRV_BOOLEAN_TRUE_DESC);
+static int preallocate_dma = 1;
+MODULE_PARM(preallocate_dma, "i");
+MODULE_PARM_DESC(preallocate_dma, "Preallocate DMA memory when the PCM devices are
+initialized.");
+MODULE_PARM_SYNTAX(preallocate_dma, SNDRV_BOOLEAN_TRUE_DESC);
+
+static int maximum_substreams = 4;
+MODULE_PARM(maximum_substreams, "i");
+MODULE_PARM_DESC(maximum_substreams, "Maximum substreams with preallocated DMA
+memory.");
+MODULE_PARM_SYNTAX(maximum_substreams, SNDRV_BOOLEAN_TRUE_DESC);
static int snd_minimum_buffer = 16384;
@@ -168,7 +168,7 @@
dma_addr_t dma_addr = 0UL;
snd_info_entry_t *entry;
- if (!size || !snd_preallocate_dma || substream->number >=
snd_maximum_substreams) {
+ if (!size || !preallocate_dma || substream->number >= maximum_substreams) {
size = 0;
} else {
switch (substream->dma_type) {
Index: rawmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/rawmidi.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rawmidi.c 14 Oct 2002 09:42:35 -0000 1.21
+++ rawmidi.c 21 Oct 2002 18:28:20 -0000 1.22
@@ -38,14 +38,14 @@
MODULE_LICENSE("GPL");
#ifdef CONFIG_SND_OSSEMUL
-static int snd_midi_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 0};
-static int snd_amidi_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
-MODULE_PARM(snd_midi_map, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_midi_map, "Raw MIDI device number assigned to 1st OSS device.");
-MODULE_PARM_SYNTAX(snd_midi_map, "default:0,skill:advanced");
-MODULE_PARM(snd_amidi_map, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(snd_amidi_map, "Raw MIDI device number assigned to 2nd OSS device.");
-MODULE_PARM_SYNTAX(snd_amidi_map, "default:1,skill:advanced");
+static int midi_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 0};
+static int amidi_map[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
+MODULE_PARM(midi_map, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(midi_map, "Raw MIDI device number assigned to 1st OSS device.");
+MODULE_PARM_SYNTAX(midi_map, "default:0,skill:advanced");
+MODULE_PARM(amidi_map, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(amidi_map, "Raw MIDI device number assigned to 2nd OSS device.");
+MODULE_PARM_SYNTAX(amidi_map, "default:1,skill:advanced");
#endif /* CONFIG_SND_OSSEMUL */
static int snd_rawmidi_free(snd_rawmidi_t *rawmidi);
@@ -379,7 +379,7 @@
cardnum = SNDRV_MINOR_OSS_CARD(minor(inode->i_rdev));
cardnum %= SNDRV_CARDS;
device = SNDRV_MINOR_OSS_DEVICE(minor(inode->i_rdev)) ==
SNDRV_MINOR_OSS_MIDI ?
- snd_midi_map[cardnum] : snd_amidi_map[cardnum];
+ midi_map[cardnum] : amidi_map[cardnum];
break;
#endif
default:
@@ -1419,7 +1419,7 @@
}
#ifdef CONFIG_SND_OSSEMUL
rmidi->ossreg = 0;
- if (rmidi->device == snd_midi_map[rmidi->card->number]) {
+ if (rmidi->device == midi_map[rmidi->card->number]) {
if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
rmidi->card, 0, &snd_rawmidi_reg, name) <
0) {
snd_printk(KERN_ERR "unable to register OSS rawmidi device
%i:%i\n", rmidi->card->number, 0);
@@ -1430,7 +1430,7 @@
#endif
}
}
- if (rmidi->device == snd_amidi_map[rmidi->card->number]) {
+ if (rmidi->device == amidi_map[rmidi->card->number]) {
if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
rmidi->card, 1, &snd_rawmidi_reg, name) <
0) {
snd_printk(KERN_ERR "unable to register OSS rawmidi device
%i:%i\n", rmidi->card->number, 1);
@@ -1484,13 +1484,13 @@
}
#ifdef CONFIG_SND_OSSEMUL
if (rmidi->ossreg) {
- if (rmidi->device == snd_midi_map[rmidi->card->number]) {
+ if (rmidi->device == midi_map[rmidi->card->number]) {
snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
rmidi->card, 0);
#ifdef SNDRV_OSS_INFO_DEV_MIDI
snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_MIDI,
rmidi->card->number);
#endif
}
- if (rmidi->device == snd_amidi_map[rmidi->card->number])
+ if (rmidi->device == amidi_map[rmidi->card->number])
snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
rmidi->card, 1);
rmidi->ossreg = 0;
}
@@ -1532,13 +1532,13 @@
#ifdef CONFIG_SND_OSSEMUL
/* check device map table */
for (i = 0; i < SNDRV_CARDS; i++) {
- if (snd_midi_map[i] < 0 || snd_midi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
- snd_printk(KERN_ERR "invalid midi_map[%d] = %d\n", i,
snd_midi_map[i]);
- snd_midi_map[i] = 0;
- }
- if (snd_amidi_map[i] < 0 || snd_amidi_map[i] >= SNDRV_RAWMIDI_DEVICES)
{
- snd_printk(KERN_ERR "invalid amidi_map[%d] = %d\n", i,
snd_amidi_map[i]);
- snd_amidi_map[i] = 1;
+ if (midi_map[i] < 0 || midi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
+ snd_printk(KERN_ERR "invalid midi_map[%d] = %d\n", i,
+midi_map[i]);
+ midi_map[i] = 0;
+ }
+ if (amidi_map[i] < 0 || amidi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
+ snd_printk(KERN_ERR "invalid amidi_map[%d] = %d\n", i,
+amidi_map[i]);
+ amidi_map[i] = 1;
}
}
#endif /* CONFIG_SND_OSSEMUL */
Index: sound.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sound.c 13 Oct 2002 13:16:39 -0000 1.25
+++ sound.c 21 Oct 2002 18:28:20 -0000 1.26
@@ -36,32 +36,32 @@
#define SNDRV_OS_MINORS 256
-int snd_major = CONFIG_SND_MAJOR;
-static int snd_cards_limit = SNDRV_CARDS;
-int snd_device_mode = S_IFCHR | S_IRUGO | S_IWUGO;
-int snd_device_gid = 0;
-int snd_device_uid = 0;
+int major = CONFIG_SND_MAJOR;
+static int cards_limit = SNDRV_CARDS;
+int device_mode = S_IFCHR | S_IRUGO | S_IWUGO;
+int device_gid = 0;
+int device_uid = 0;
MODULE_AUTHOR("Jaroslav Kysela <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("Advanced Linux Sound Architecture driver for soundcards.");
MODULE_LICENSE("GPL");
MODULE_CLASSES("{sound}");
MODULE_SUPPORTED_DEVICE("sound");
-MODULE_PARM(snd_major, "i");
-MODULE_PARM_DESC(snd_major, "Major # for sound driver.");
-MODULE_PARM_SYNTAX(snd_major, "default:116,skill:devel");
-MODULE_PARM(snd_cards_limit, "i");
-MODULE_PARM_DESC(snd_cards_limit, "Count of soundcards installed in the system.");
-MODULE_PARM_SYNTAX(snd_cards_limit, "default:8,skill:advanced");
-MODULE_PARM(snd_device_mode, "i");
-MODULE_PARM_DESC(snd_device_mode, "Device file permission mask for sound dynamic
device filesystem.");
-MODULE_PARM_SYNTAX(snd_device_mode, "default:0666,base:8");
-MODULE_PARM(snd_device_gid, "i");
-MODULE_PARM_DESC(snd_device_gid, "Device file GID for sound dynamic device
filesystem.");
-MODULE_PARM_SYNTAX(snd_device_gid, "default:0");
-MODULE_PARM(snd_device_uid, "i");
-MODULE_PARM_DESC(snd_device_uid, "Device file UID for sound dynamic device
filesystem.");
-MODULE_PARM_SYNTAX(snd_device_uid, "default:0");
+MODULE_PARM(major, "i");
+MODULE_PARM_DESC(major, "Major # for sound driver.");
+MODULE_PARM_SYNTAX(major, "default:116,skill:devel");
+MODULE_PARM(cards_limit, "i");
+MODULE_PARM_DESC(cards_limit, "Count of soundcards installed in the system.");
+MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced");
+MODULE_PARM(device_mode, "i");
+MODULE_PARM_DESC(device_mode, "Device file permission mask for sound dynamic device
+filesystem.");
+MODULE_PARM_SYNTAX(device_mode, "default:0666,base:8");
+MODULE_PARM(device_gid, "i");
+MODULE_PARM_DESC(device_gid, "Device file GID for sound dynamic device filesystem.");
+MODULE_PARM_SYNTAX(device_gid, "default:0");
+MODULE_PARM(device_uid, "i");
+MODULE_PARM_DESC(device_uid, "Device file UID for sound dynamic device filesystem.");
+MODULE_PARM_SYNTAX(device_uid, "default:0");
int snd_ecards_limit;
@@ -302,7 +302,7 @@
#endif
int card;
- snd_ecards_limit = snd_cards_limit;
+ snd_ecards_limit = cards_limit;
for (card = 0; card < SNDRV_CARDS; card++)
INIT_LIST_HEAD(&snd_minors_hash[card]);
#ifdef CONFIG_SND_OSSEMUL
@@ -316,8 +316,8 @@
devfs_handle = devfs_mk_dir(NULL, "snd", NULL);
#endif
#endif
- if (register_chrdev(snd_major, "alsa", &snd_fops)) {
- snd_printk(KERN_ERR "unable to register native major device number
%d\n", snd_major);
+ if (register_chrdev(major, "alsa", &snd_fops)) {
+ snd_printk(KERN_ERR "unable to register native major device number
+%d\n", major);
return -EIO;
}
#ifdef CONFIG_SND_DEBUG_MEMORY
@@ -333,10 +333,10 @@
snd_info_minor_register();
#endif
#ifdef CONFIG_DEVFS_FS
- for (controlnum = 0; controlnum < snd_cards_limit; controlnum++) {
+ for (controlnum = 0; controlnum < cards_limit; controlnum++) {
sprintf(controlname, "snd/controlC%d", controlnum);
devfs_register(NULL, controlname, DEVFS_FL_DEFAULT,
- snd_major, controlnum<<5, snd_device_mode | S_IFCHR,
+ major, controlnum<<5, device_mode | S_IFCHR,
&snd_fops, NULL);
}
#endif
@@ -355,7 +355,7 @@
char controlname[24];
short controlnum;
- for (controlnum = 0; controlnum < snd_cards_limit; controlnum++) {
+ for (controlnum = 0; controlnum < cards_limit; controlnum++) {
sprintf(controlname, "snd/controlC%d", controlnum);
devfs_find_and_unregister(NULL, controlname, 0, 0, DEVFS_SPECIAL_CHR,
0);
}
@@ -371,8 +371,8 @@
#ifdef CONFIG_SND_DEBUG_MEMORY
snd_memory_done();
#endif
- if (unregister_chrdev(snd_major, "alsa") != 0)
- snd_printk(KERN_ERR "unable to unregister major device number %d\n",
snd_major);
+ if (unregister_chrdev(major, "alsa") != 0)
+ snd_printk(KERN_ERR "unable to unregister major device number %d\n",
+major);
#ifdef CONFIG_DEVFS_FS
devfs_unregister(devfs_handle);
#endif
Index: timer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/timer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- timer.c 13 Oct 2002 13:16:39 -0000 1.16
+++ timer.c 21 Oct 2002 18:28:20 -0000 1.17
@@ -41,13 +41,13 @@
#define DEFAULT_TIMER_LIMIT 2
#endif
-int snd_timer_limit = DEFAULT_TIMER_LIMIT;
+int timer_limit = DEFAULT_TIMER_LIMIT;
MODULE_AUTHOR("Jaroslav Kysela <[EMAIL PROTECTED]>, Takashi Iwai <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("ALSA timer interface");
MODULE_LICENSE("GPL");
MODULE_CLASSES("{sound}");
-MODULE_PARM(snd_timer_limit, "i");
-MODULE_PARM_DESC(snd_timer_limit, "Maximum global timers in system.");
+MODULE_PARM(timer_limit, "i");
+MODULE_PARM_DESC(timer_limit, "Maximum global timers in system.");
typedef struct {
snd_timer_instance_t *timeri;
@@ -152,7 +152,7 @@
switch (tid->dev_class) {
case SNDRV_TIMER_CLASS_GLOBAL:
- if (tid->device >= snd_timer_limit)
+ if (tid->device >= timer_limit)
return;
sprintf(str, "snd-timer-%i", tid->device);
break;
-------------------------------------------------------
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
