Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f8a01b7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/seq-kconfig' into for-next

parents f5abd532 111b0cdb

include/sound/emux_synth.h

+3 −5
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ 
#include <sound/seq_device.h>

#include <sound/soundfont.h>

#include <sound/seq_midi_emul.h>

#ifdef CONFIG_SND_SEQUENCER_OSS

#include <sound/seq_oss.h>

#endif

#include <sound/emux_legacy.h>

#include <sound/seq_virmidi.h>
@@ -66,7 +64,7 @@ struct snd_emux_operators { 
		       const void __user *data, long count);

	void (*sysex)(struct snd_emux *emu, char *buf, int len, int parsed,

		      struct snd_midi_channel_set *chset);

#ifdef CONFIG_SND_SEQUENCER_OSS

#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)

	int (*oss_ioctl)(struct snd_emux *emu, int cmd, int p1, int p2);

#endif

};
@@ -129,7 +127,7 @@ struct snd_emux { 
	struct snd_info_entry *proc;

#endif



#ifdef CONFIG_SND_SEQUENCER_OSS

#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)

	struct snd_seq_device *oss_synth;

#endif

};
@@ -150,7 +148,7 @@ struct snd_emux_port { 
#ifdef SNDRV_EMUX_USE_RAW_EFFECT

	struct snd_emux_effect_table *effect;

#endif

#ifdef CONFIG_SND_SEQUENCER_OSS

#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)

	struct snd_seq_oss_arg *oss_arg;

#endif

};

include/sound/opl3.h

+1 −3
Original line number Diff line number Diff line
@@ -55,10 +55,8 @@ 
#include <sound/hwdep.h>

#include <sound/timer.h>

#include <sound/seq_midi_emul.h>

#ifdef CONFIG_SND_SEQUENCER_OSS

#include <sound/seq_oss.h>

#include <sound/seq_oss_legacy.h>

#endif

#include <sound/seq_device.h>

#include <sound/asound_fm.h>
@@ -330,7 +328,7 @@ struct snd_opl3 { 
	struct snd_seq_device *seq_dev;	/* sequencer device */

	struct snd_midi_channel_set * chset;



#ifdef CONFIG_SND_SEQUENCER_OSS

#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)

	struct snd_seq_device *oss_seq_dev;	/* OSS sequencer device */

	struct snd_midi_channel_set * oss_chset;

#endif

sound/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ source "sound/soc/Kconfig" 


source "sound/x86/Kconfig"



source "sound/synth/Kconfig"



endif # SND



menuconfig SOUND_PRIME

sound/core/Kconfig

+9 −50
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@ config SND_DMAENGINE_PCM 
config SND_HWDEP

	tristate



config SND_SEQ_DEVICE

	tristate



config SND_RAWMIDI

	tristate

	select SND_SEQ_DEVICE if SND_SEQUENCER != n



config SND_COMPRESS_OFFLOAD

	tristate
@@ -33,38 +37,15 @@ config SND_JACK_INPUT_DEV 
	depends on SND_JACK

	default y if INPUT=y || INPUT=SND



config SND_SEQUENCER

	tristate "Sequencer support"

	select SND_TIMER

	help

	  Say Y or M to enable MIDI sequencer and router support.  This

	  feature allows routing and enqueueing of MIDI events.  Events

	  can be processed at a given time.



	  Many programs require this feature, so you should enable it

	  unless you know what you're doing.



config SND_SEQ_DUMMY

	tristate "Sequencer dummy client"

	depends on SND_SEQUENCER

	help

	  Say Y here to enable the dummy sequencer client.  This client

	  is a simple MIDI-through client: all normal input events are

	  redirected to the output port immediately.



	  You don't need this unless you want to connect many MIDI

	  devices or applications together.



	  To compile this driver as a module, choose M here: the module

	  will be called snd-seq-dummy.



config SND_OSSEMUL

	bool "Enable OSS Emulation"

	select SOUND_OSS_CORE

	bool

	help

	  This option enables the build of OSS emulation layer.



config SND_MIXER_OSS

	tristate "OSS Mixer API"

	select SND_OSSEMUL

	depends on SND_OSSEMUL

	help

	  To enable OSS mixer API emulation (/dev/mixer*), say Y here

	  and read <file:Documentation/sound/alsa/OSS-Emulation.txt>.
@@ -76,7 +57,7 @@ config SND_MIXER_OSS 


config SND_PCM_OSS

	tristate "OSS PCM (digital audio) API"

	select SND_OSSEMUL

	depends on SND_OSSEMUL

	select SND_PCM

	help

	  To enable OSS digital audio (PCM) emulation (/dev/dsp*), say Y
@@ -107,20 +88,6 @@ config SND_PCM_TIMER 
	  For some embedded devices, we may disable it to reduce memory

	  footprint, about 20KB on x86_64 platform.



config SND_SEQUENCER_OSS

	bool "OSS Sequencer API"

	depends on SND_SEQUENCER

	select SND_OSSEMUL

	help

	  Say Y here to enable OSS sequencer emulation (both

	  /dev/sequencer and /dev/music interfaces).



	  Many programs still use the OSS API, so say Y.



	  If you choose M in "Sequencer support" (SND_SEQUENCER),

	  this will be compiled as a module. The module will be called

	  snd-seq-oss.



config SND_HRTIMER

	tristate "HR-timer backend support"

	depends on HIGH_RES_TIMERS
@@ -133,14 +100,6 @@ config SND_HRTIMER 
	  To compile this driver as a module, choose M here: the module

	  will be called snd-hrtimer.



config SND_SEQ_HRTIMER_DEFAULT

	bool "Use HR-timer as default sequencer timer"

	depends on SND_HRTIMER && SND_SEQUENCER

	default y

	help

	  Say Y here to use the HR-timer backend as the default sequencer

	  timer.



config SND_DYNAMIC_MINORS

	bool "Dynamic device file minor numbers"

	help

sound/core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ snd-timer-objs := timer.o 
snd-hrtimer-objs  := hrtimer.o

snd-rtctimer-objs := rtctimer.o

snd-hwdep-objs    := hwdep.o

snd-seq-device-objs := seq_device.o



snd-compress-objs := compress_offload.o
@@ -40,6 +41,7 @@ obj-$(CONFIG_SND_TIMER) += snd-timer.o 
obj-$(CONFIG_SND_HRTIMER)	+= snd-hrtimer.o

obj-$(CONFIG_SND_PCM)		+= snd-pcm.o

obj-$(CONFIG_SND_DMAENGINE_PCM)	+= snd-pcm-dmaengine.o

obj-$(CONFIG_SND_SEQ_DEVICE)	+= snd-seq-device.o

obj-$(CONFIG_SND_RAWMIDI)	+= snd-rawmidi.o



obj-$(CONFIG_SND_OSSEMUL)	+= oss/