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

Commit 111b0cdb authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: Allow the modular sequencer registration 



Many drivers bind the sequencer stuff in off-load by another driver
module, so that it's loaded only on demand.  In the current code, this
mechanism doesn't work when the driver is built-in while the sequencer
is module.  We check with IS_REACHABLE() and enable only when the
sequencer is in the same level of build.

However, this is basically a overshoot.  The binder code
(snd-seq-device) is an individual module from the sequencer core
(snd-seq), and we just have to make the former a built-in while
keeping the latter a module for allowing the scenario like the above.

This patch achieves that by rewriting Kconfig slightly.  Now, a driver
that provides the manual sequencer device binding should select
CONFIG_SND_SEQ_DEVICE in a way as
	select SND_SEQ_DEVICE if SND_SEQUENCER != n

Note that the "!=n" is needed here to avoid the influence of the
sequencer core is module while the driver is built-in.

Also, since rawmidi.o may be linked with snd_seq_device.o when
built-in, we have to shuffle the code to make the linker happy.
(the kernel linker isn't smart enough yet to handle such a case.)
That is, snd_seq_device.c is moved to sound/core from sound/core/seq,
as well as Makefile.

Last but not least, the patch replaces the code using IS_REACHABLE()
with IS_ENABLED(), since now the condition meets always when enabled.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 82721155

sound/core/Kconfig

+4 −0
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

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/

sound/core/rawmidi.c

+2 −2
Original line number Diff line number Diff line
@@ -1610,7 +1610,7 @@ static int snd_rawmidi_dev_free(struct snd_device *device) 
	return snd_rawmidi_free(rmidi);

}



#if IS_REACHABLE(CONFIG_SND_SEQUENCER)

#if IS_ENABLED(CONFIG_SND_SEQUENCER)

static void snd_rawmidi_dev_seq_free(struct snd_seq_device *device)

{

	struct snd_rawmidi *rmidi = device->private_data;
@@ -1691,7 +1691,7 @@ static int snd_rawmidi_dev_register(struct snd_device *device) 
		}

	}

	rmidi->proc_entry = entry;

#if IS_REACHABLE(CONFIG_SND_SEQUENCER)

#if IS_ENABLED(CONFIG_SND_SEQUENCER)

	if (!rmidi->ops || !rmidi->ops->dev_register) { /* own registration mechanism */

		if (snd_seq_device_new(rmidi->card, rmidi->device, SNDRV_SEQ_DEV_ID_MIDISYNTH, 0, &rmidi->seq_dev) >= 0) {

			rmidi->seq_dev->private_data = rmidi;

sound/core/seq/Kconfig

+1 −1
Original line number Diff line number Diff line 
config SND_SEQUENCER

	tristate "Sequencer support"

	select SND_TIMER

	select SND_SEQ_DEVICE

	help

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

	  feature allows routing and enqueueing of MIDI events.  Events
@@ -59,4 +60,3 @@ config SND_SEQ_VIRMIDI 
	tristate



endif # SND_SEQUENCER

sound/core/seq/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>

#



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

snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \

                seq_fifo.o seq_prioq.o seq_timer.o \

                seq_system.o seq_ports.o
@@ -14,7 +13,7 @@ snd-seq-midi-event-objs := seq_midi_event.o 
snd-seq-dummy-objs := seq_dummy.o

snd-seq-virmidi-objs := seq_virmidi.o



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

obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o

obj-$(CONFIG_SND_SEQUENCER_OSS) += oss/



obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o