Skip to content

L
linux
Commit 671ffdc8 authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files
Options

ALSA update 

  - fixed makefiles for sequencer modules:
    when CONFIG_SND_SEQUENCER is m, then synth modules should be m, too
parent bfc3f9b2
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 106 deletions
include/sound/version.h
View file @ 671ffdc8
/* include/version.h. Generated automatically by configure. */ /* include/version.h. Generated automatically by configure. */
#define CONFIG_SND_VERSION "0.9.0rc6" #define CONFIG_SND_VERSION "0.9.0rc6"
#define CONFIG_SND_DATE " (Mon Jan 27 17:35:55 2003 UTC)" #define CONFIG_SND_DATE " (Tue Jan 28 12:17:23 2003 UTC)"
sound/core/ioctl32/ioctl32.c
View file @ 671ffdc8
...@@ -249,17 +249,14 @@ static int get_ctl_type(struct file *file, snd_ctl_elem_id_t *id) ...@@ -249,17 +249,14 @@ static int get_ctl_type(struct file *file, snd_ctl_elem_id_t *id)
ctl = snd_magic_cast(snd_ctl_file_t, file->private_data, return -ENXIO); ctl = snd_magic_cast(snd_ctl_file_t, file->private_data, return -ENXIO);
read_lock(&ctl->card->control_rwlock);
kctl = snd_ctl_find_id(ctl->card, id); kctl = snd_ctl_find_id(ctl->card, id);
if (! kctl) { if (! kctl) {
read_unlock(&ctl->card->control_rwlock);
return -ENXIO; return -ENXIO;
} }
info.id = *id; info.id = *id;
err = kctl->info(kctl, &info); err = kctl->info(kctl, &info);
if (err >= 0) if (err >= 0)
err = info.type; err = info.type;
read_unlock(&ctl->card->control_rwlock);
return err; return err;
} }
......
sound/core/seq/Makefile
View file @ 671ffdc8
...@@ -22,6 +22,17 @@ snd-seq-instr-objs := seq_instr.o ...@@ -22,6 +22,17 @@ snd-seq-instr-objs := seq_instr.o
snd-seq-dummy-objs := seq_dummy.o snd-seq-dummy-objs := seq_dummy.o
snd-seq-virmidi-objs := seq_virmidi.o snd-seq-virmidi-objs := seq_virmidi.o
RAWMIDI_OBJS = snd-seq-midi.o snd-seq-midi-event.o
OPL3_OBJS = snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
#
# this function returns:
# "m" - CONFIG_SND_SEQUENCER is m
# <empty string> - CONFIG_SND_SEQUENCER is undefined
# otherwise parameter #1 value
#
sequencer := $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),m,$(if $(CONFIG_SND_SEQUENCER),$(1)))
obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o
ifeq ($(CONFIG_SND_SEQUENCER_OSS),y) ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o
...@@ -29,54 +40,52 @@ endif ...@@ -29,54 +40,52 @@ endif
obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o
# Toplevel Module Dependency # Toplevel Module Dependency
RAWMIDI_OBJS = snd-seq-midi.o snd-seq-midi-event.o
OPL3_OBJS = snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o
obj-$(CONFIG_SND_SERIAL_U16550) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_SERIAL_U16550)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_MTPAV) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_MTPAV)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_MPU401) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_MPU401)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_ALS100) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_ALS100)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_AZT2320) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_AZT2320)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_DT019X) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_DT019X)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_ES18XX) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_ES18XX)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_OPL3SA2) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_OPL3SA2)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_AD1816A) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_AD1816A)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_CS4231) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_CS4231)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_CS4232) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_CS4232)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_CS4236) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_CS4236)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_PC98_CS4232) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_PC98_CS4232)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_ES1688) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_ES1688)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_GUSCLASSIC) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_GUSCLASSIC)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_GUSMAX) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_GUSMAX)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_GUSEXTREME) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_GUSEXTREME)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_INTERWAVE) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_INTERWAVE)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_INTERWAVE_STB) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_INTERWAVE_STB)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_OPTI92X_AD1848) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_OPTI92X_AD1848)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_OPTI92X_CS4231) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_OPTI92X_CS4231)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_OPTI93X) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_OPTI93X)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_SB8) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_SB8)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_SB16) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_SB16)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_SBAWE) += $(RAWMIDI_OBJS) $(OPL3_OBJS) snd-seq-virmidi.o obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += $(RAWMIDI_OBJS) $(OPL3_OBJS) snd-seq-virmidi.o
obj-$(CONFIG_SND_ES968) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_ES968)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_WAVEFRONT) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_WAVEFRONT)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_ALS4000) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_ALS4000)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_CMIPCI) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_CMIPCI)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_CS4281) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_CS4281)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_ENS1370) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_ENS1370)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_ENS1371) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_ENS1371)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_ES1938) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_ES1938)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_ES1968) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_ES1968)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_FM801) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_FM801)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_ICE1712) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_ICE1712)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_INTEL8X0) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_INTEL8X0)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_SONICVIBES) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_SONICVIBES)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_VIA82XX) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_VIA82XX)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_ALI5451) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_ALI5451)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_CS46XX) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_CS46XX)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_EMU10K1) += $(RAWMIDI_OBJS) snd-seq-midi-emul.o snd-seq-virmidi.o obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += $(RAWMIDI_OBJS) snd-seq-midi-emul.o snd-seq-virmidi.o
obj-$(CONFIG_SND_TRIDENT) += $(RAWMIDI_OBJS) snd-seq-midi-emul.o snd-seq-instr.o obj-$(call sequencer,$(CONFIG_SND_TRIDENT)) += $(RAWMIDI_OBJS) snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_YMFPCI) += $(RAWMIDI_OBJS) $(OPL3_OBJS) obj-$(call sequencer,$(CONFIG_SND_YMFPCI)) += $(RAWMIDI_OBJS) $(OPL3_OBJS)
obj-$(CONFIG_SND_USB_AUDIO) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_USB_AUDIO)) += $(RAWMIDI_OBJS)
obj-$(CONFIG_SND_HDSP) += $(RAWMIDI_OBJS) obj-$(call sequencer,$(CONFIG_SND_HDSP)) += $(RAWMIDI_OBJS)
obj-m := $(sort $(obj-m)) obj-m := $(sort $(obj-m))
sound/core/seq/instr/Makefile
View file @ 671ffdc8
...@@ -10,36 +10,44 @@ snd-ainstr-simple-objs := ainstr_simple.o ...@@ -10,36 +10,44 @@ snd-ainstr-simple-objs := ainstr_simple.o
snd-ainstr-gf1-objs := ainstr_gf1.o snd-ainstr-gf1-objs := ainstr_gf1.o
snd-ainstr-iw-objs := ainstr_iw.o snd-ainstr-iw-objs := ainstr_iw.o
#
# this function returns:
# "m" - CONFIG_SND_SEQUENCER is m
# <empty string> - CONFIG_SND_SEQUENCER is undefined
# otherwise parameter #1 value
#
sequencer := $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),m,$(if $(CONFIG_SND_SEQUENCER),$(1)))
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_ALS100) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_ALS100)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_AZT2320) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_AZT2320)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_DT019X) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_DT019X)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_ES18XX) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_ES18XX)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_OPL3SA2) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_OPL3SA2)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_AD1816A) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_AD1816A)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_CS4232) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_CS4232)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_CS4236) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_CS4236)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_PC98_CS4232) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_PC98_CS4232)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_ES1688) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_ES1688)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_GUSCLASSIC) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o obj-$(call sequencer,$(CONFIG_SND_GUSCLASSIC)) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o
obj-$(CONFIG_SND_GUSMAX) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o obj-$(call sequencer,$(CONFIG_SND_GUSMAX)) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o
obj-$(CONFIG_SND_GUSEXTREME) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_GUSEXTREME)) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o snd-ainstr-fm.o
obj-$(CONFIG_SND_INTERWAVE) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o obj-$(call sequencer,$(CONFIG_SND_INTERWAVE)) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o
obj-$(CONFIG_SND_INTERWAVE_STB) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o obj-$(call sequencer,$(CONFIG_SND_INTERWAVE_STB)) += snd-ainstr-iw.o snd-ainstr-gf1.o snd-ainstr-simple.o
obj-$(CONFIG_SND_OPTI92X_AD1848) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_OPTI92X_AD1848)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_OPTI92X_CS4231)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_OPTI93X) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_OPTI93X)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_SB8) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_SB8)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_SB16) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_SB16)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_SBAWE) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_WAVEFRONT) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_WAVEFRONT)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_ALS4000) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_ALS4000)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_CMIPCI) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_CMIPCI)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_CS4281) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_CS4281)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_ES1938) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_ES1938)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_FM801) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_FM801)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_SONICVIBES) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_SONICVIBES)) += snd-ainstr-fm.o
obj-$(CONFIG_SND_TRIDENT) += snd-ainstr-simple.o obj-$(call sequencer,$(CONFIG_SND_TRIDENT)) += snd-ainstr-simple.o
obj-$(CONFIG_SND_YMFPCI) += snd-ainstr-fm.o obj-$(call sequencer,$(CONFIG_SND_YMFPCI)) += snd-ainstr-fm.o
obj-m := $(sort $(obj-m)) obj-m := $(sort $(obj-m))
sound/core/seq/oss/Makefile
View file @ 671ffdc8
...@@ -7,6 +7,4 @@ snd-seq-oss-objs := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \ ...@@ -7,6 +7,4 @@ snd-seq-oss-objs := seq_oss.o seq_oss_init.o seq_oss_timer.o seq_oss_ioctl.o \
seq_oss_event.o seq_oss_rw.o seq_oss_synth.o \ seq_oss_event.o seq_oss_rw.o seq_oss_synth.o \
seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o seq_oss_midi.o seq_oss_readq.o seq_oss_writeq.o
ifeq ($(CONFIG_SND_SEQUENCER_OSS),y) obj-$(CONFIG_SND_SEQUENCER) += snd-seq-oss.o
obj-$(CONFIG_SND_SEQUENCER) += snd-seq-oss.o
endif
sound/isa/gus/Makefile
View file @ 671ffdc8
...@@ -19,18 +19,24 @@ snd-gusmax-objs := gusmax.o ...@@ -19,18 +19,24 @@ snd-gusmax-objs := gusmax.o
snd-interwave-objs := interwave.o snd-interwave-objs := interwave.o
snd-interwave-stb-objs := interwave-stb.o snd-interwave-stb-objs := interwave-stb.o
#
# this function returns:
# "m" - CONFIG_SND_SEQUENCER is m
# <empty string> - CONFIG_SND_SEQUENCER is undefined
# otherwise parameter #1 value
#
sequencer := $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),m,$(if $(CONFIG_SND_SEQUENCER),$(1)))
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_GUSCLASSIC) += snd-gusclassic.o snd-gus-lib.o obj-$(CONFIG_SND_GUSCLASSIC) += snd-gusclassic.o snd-gus-lib.o
obj-$(call sequencer,$(CONFIG_SND_GUSCLASSIC)) += snd-gus-synth.o
obj-$(CONFIG_SND_GUSMAX) += snd-gusmax.o snd-gus-lib.o obj-$(CONFIG_SND_GUSMAX) += snd-gusmax.o snd-gus-lib.o
obj-$(call sequencer,$(CONFIG_SND_GUSMAX)) += snd-gus-synth.o
obj-$(CONFIG_SND_GUSEXTREME) += snd-gusextreme.o snd-gus-lib.o obj-$(CONFIG_SND_GUSEXTREME) += snd-gusextreme.o snd-gus-lib.o
obj-$(call sequencer,$(CONFIG_SND_GUSEXTREME)) += snd-gus-synth.o
obj-$(CONFIG_SND_INTERWAVE) += snd-interwave.o snd-gus-lib.o obj-$(CONFIG_SND_INTERWAVE) += snd-interwave.o snd-gus-lib.o
obj-$(call sequencer,$(CONFIG_SND_INTERWAVE)) += snd-gus-synth.o
obj-$(CONFIG_SND_INTERWAVE_STB) += snd-interwave-stb.o snd-gus-lib.o obj-$(CONFIG_SND_INTERWAVE_STB) += snd-interwave-stb.o snd-gus-lib.o
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) obj-$(call sequencer,$(CONFIG_SND_INTERWAVE_STB)) += snd-gus-synth.o
obj-$(CONFIG_SND_GUSCLASSIC) += snd-gus-synth.o
obj-$(CONFIG_SND_GUSMAX) += snd-gus-synth.o
obj-$(CONFIG_SND_GUSEXTREME) += snd-gus-synth.o
obj-$(CONFIG_SND_INTERWAVE) += snd-gus-synth.o
obj-$(CONFIG_SND_INTERWAVE_STB) += snd-gus-synth.o
endif
obj-m := $(sort $(obj-m)) obj-m := $(sort $(obj-m))
sound/isa/sb/Makefile
View file @ 671ffdc8
...@@ -15,6 +15,14 @@ snd-sbawe-objs := sbawe.o emu8000.o ...@@ -15,6 +15,14 @@ snd-sbawe-objs := sbawe.o emu8000.o
snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
snd-es968-objs := es968.o snd-es968-objs := es968.o
#
# this function returns:
# "m" - CONFIG_SND_SEQUENCER is m
# <empty string> - CONFIG_SND_SEQUENCER is undefined
# otherwise parameter #1 value
#
sequencer := $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),m,$(if $(CONFIG_SND_SEQUENCER),$(1)))
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_ALS100) += snd-sb16-dsp.o snd-sb-common.o obj-$(CONFIG_SND_ALS100) += snd-sb16-dsp.o snd-sb-common.o
obj-$(CONFIG_SND_CMI8330) += snd-sb16-dsp.o snd-sb-common.o obj-$(CONFIG_SND_CMI8330) += snd-sb16-dsp.o snd-sb-common.o
...@@ -28,8 +36,6 @@ ifeq ($(CONFIG_SND_SB16_CSP),y) ...@@ -28,8 +36,6 @@ ifeq ($(CONFIG_SND_SB16_CSP),y)
obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o
obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o
endif endif
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emu8000-synth.o
obj-$(CONFIG_SND_SBAWE) += snd-emu8000-synth.o
endif
obj-m := $(sort $(obj-m)) obj-m := $(sort $(obj-m))
sound/pci/emu10k1/Makefile
View file @ 671ffdc8
...@@ -10,8 +10,14 @@ snd-emu10k1-objs := emu10k1.o emu10k1_main.o \ ...@@ -10,8 +10,14 @@ snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
emuproc.o emumixer.o emufx.o emuproc.o emumixer.o emufx.o
snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
#
# this function returns:
# "m" - CONFIG_SND_SEQUENCER is m
# <empty string> - CONFIG_SND_SEQUENCER is undefined
# otherwise parameter #1 value
#
sequencer := $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),m,$(if $(CONFIG_SND_SEQUENCER),$(1)))
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emu10k1-synth.o
obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1-synth.o
endif
sound/pci/trident/Makefile
View file @ 671ffdc8
...@@ -8,8 +8,14 @@ export-objs := trident_main.o ...@@ -8,8 +8,14 @@ export-objs := trident_main.o
snd-trident-objs := trident.o trident_main.o trident_memory.o snd-trident-objs := trident.o trident_main.o trident_memory.o
snd-trident-synth-objs := trident_synth.o snd-trident-synth-objs := trident_synth.o
#
# this function returns:
# "m" - CONFIG_SND_SEQUENCER is m
# <empty string> - CONFIG_SND_SEQUENCER is undefined
# otherwise parameter #1 value
#
sequencer := $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),m,$(if $(CONFIG_SND_SEQUENCER),$(1)))
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_TRIDENT) += snd-trident.o obj-$(CONFIG_SND_TRIDENT) += snd-trident.o
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y) obj-$(call sequencer,$(CONFIG_SND_TRIDENT)) += snd-trident-synth.o
obj-$(CONFIG_SND_TRIDENT) += snd-trident-synth.o
endif
sound/synth/emux/Makefile
View file @ 671ffdc8
...@@ -5,9 +5,18 @@ ...@@ -5,9 +5,18 @@
export-objs := emux.o export-objs := emux.o
snd-emux-synth-y := emux.o emux_synth.o emux_seq.o emux_nrpn.o \ snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
emux_effect.o emux_proc.o soundfont.o emux_effect.o emux_proc.o soundfont.o \
snd-emux-synth-$(CONFIG_SND_SEQUENCER_OSS) += emux_oss.o $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o)
obj-$(CONFIG_SND_SBAWE) += snd-emux-synth.o #
obj-$(CONFIG_SND_EMU10K1) += snd-emux-synth.o # this function returns:
# "m" - CONFIG_SND_SEQUENCER is m
# <empty string> - CONFIG_SND_SEQUENCER is undefined
# otherwise parameter #1 value
#
sequencer := $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),m,$(if $(CONFIG_SND_SEQUENCER),$(1)))
# Toplevel Module Dependencies
obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emux-synth.o
obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emux-synth.o
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7