Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory usw-pr-cvs1:/tmp/cvs-serv13162a/oss
Modified Files:
mixer_oss.c pcm_oss.c
Log Message:
Compilation fixes when CONFIG_PROC_FS is not defined
Index: mixer_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/mixer_oss.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mixer_oss.c 30 Sep 2002 21:42:53 -0000 1.12
+++ mixer_oss.c 13 Oct 2002 19:18:36 -0000 1.13
@@ -1176,9 +1176,11 @@
mixer->name[sizeof(mixer->name)-1] = 0;
} else
strcpy(mixer->name, name);
+#ifdef SNDRV_OSS_INFO_DEV_MIXERS
snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIXERS,
card->number,
mixer->name);
+#endif
for (idx = 0; idx < SNDRV_OSS_MAX_MIXERS; idx++)
mixer->slots[idx].number = idx;
card->mixer_oss = mixer;
@@ -1188,7 +1190,9 @@
snd_mixer_oss_t *mixer = card->mixer_oss;
if (mixer == NULL)
return 0;
+#ifdef SNDRV_OSS_INFO_DEV_MIXERS
snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_MIXERS,
mixer->card->number);
+#endif
snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIXER, mixer->card, 0);
snd_mixer_oss_proc_done(mixer);
return snd_mixer_oss_free1(mixer);
Index: pcm_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pcm_oss.c 3 Oct 2002 07:34:24 -0000 1.19
+++ pcm_oss.c 13 Oct 2002 19:18:36 -0000 1.20
@@ -2123,9 +2123,11 @@
pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream_count
&&
!(pcm->info_flags & SNDRV_PCM_INFO_HALF_DUPLEX));
sprintf(name, "%s%s", pcm->name, duplex ? " (DUPLEX)" : "");
+#ifdef SNDRV_OSS_INFO_DEV_AUDIO
snd_oss_info_register(SNDRV_OSS_INFO_DEV_AUDIO,
pcm->card->number,
name);
+#endif
pcm->oss.reg++;
}
if (snd_adsp_map[pcm->card->number] == pcm->device) {
@@ -2146,7 +2148,9 @@
if (snd_dsp_map[pcm->card->number] == pcm->device) {
snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,
pcm->card, 0);
+#ifdef SNDRV_OSS_INFO_DEV_AUDIO
snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_AUDIO,
pcm->card->number);
+#endif
}
if (snd_adsp_map[pcm->card->number] == pcm->device)
snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_PCM,
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
