Commit 21a3479a authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

[ALSA] PCM midlevel & PCM OSS - make procfs & OSS plugin code optional 



Modules: ALSA Core,PCM Midlevel,ALSA<-OSS emulation,USB generic driver

1) The verbose procfs code for the PCM midlevel and usb audio
   can be removed now (more patches will follow).
   CONFIG_SND_VERBOSE_PROCFS
2) The PCM OSS plugin system can be also compiled optionaly.
   CONFIG_SND_PCM_OSS_PLUGINS

Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 153abaa4

include/sound/pcm_oss.h

+2 −0
Original line number Diff line number Diff line
@@ -56,8 +56,10 @@ struct snd_pcm_oss_runtime { 
	size_t mmap_bytes;

	char *buffer;				/* vmallocated period */

	size_t buffer_used;			/* used length from period buffer */

#ifdef CONFIG_SND_PCM_OSS_PLUGINS

	struct snd_pcm_plugin *plugin_first;

	struct snd_pcm_plugin *plugin_last;

#endif

	unsigned int prev_hw_ptr_interrupt;

};

sound/core/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -73,6 +73,15 @@ config SND_PCM_OSS 
	  To compile this driver as a module, choose M here: the module

	  will be called snd-pcm-oss.



config SND_PCM_OSS_PLUGINS

	bool "OSS PCM (digital audio) API - Include plugin system"

	depends on SND_PCM_OSS

        default y

	help

          If you disable this option, the ALSA's OSS PCM API will not

          support conversion of channels, formats and rates. It will

          behave like most of new OSS/Free drivers in 2.4/2.6 kernels.



config SND_SEQUENCER_OSS

	bool "OSS Sequencer API"

	depends on SND && SND_SEQUENCER
@@ -130,6 +139,15 @@ config SND_SUPPORT_OLD_API 
	  Say Y here to support the obsolete ALSA PCM API (ver.0.9.0 rc3

	  or older).



config SND_VERBOSE_PROCFS

	bool "Verbose procfs contents"

	depends on SND

	default y

	help

	  Say Y here to include code for verbose procfs contents (provides

          usefull information to developers when a problem occurs). On the

          other side, it makes the ALSA subsystem larger.



config SND_VERBOSE_PRINTK

	bool "Verbose printk"

	depends on SND

sound/core/oss/copy.c

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
 */



#include <sound/driver.h>



#ifdef SND_PCM_OSS_PLUGINS



#include <linux/time.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -85,3 +88,5 @@ int snd_pcm_plugin_build_copy(struct snd_pcm_substream *plug, 
	*r_plugin = plugin;

	return 0;

}



#endif

sound/core/oss/io.c

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
 */

  

#include <sound/driver.h>



#ifdef CONFIG_SND_PCM_OSS_PLUGINS



#include <linux/time.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -132,3 +135,5 @@ int snd_pcm_plugin_build_io(struct snd_pcm_substream *plug, 
	*r_plugin = plugin;

	return 0;

}



#endif

sound/core/oss/linear.c

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
 */



#include <sound/driver.h>



#ifdef CONFIG_SND_PCM_OSS_PLUGINS



#include <linux/time.h>

#include <sound/core.h>

#include <sound/pcm.h>
@@ -156,3 +159,5 @@ int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug, 
	*r_plugin = plugin;

	return 0;

}



#endif