summaryrefslogtreecommitdiffstats
path: root/kernel/sound/synth/emux
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/synth/emux')
-rw-r--r--kernel/sound/synth/emux/Makefile5
-rw-r--r--kernel/sound/synth/emux/emux.c4
-rw-r--r--kernel/sound/synth/emux/emux_oss.c3
-rw-r--r--kernel/sound/synth/emux/emux_proc.c4
-rw-r--r--kernel/sound/synth/emux/emux_voice.h6
5 files changed, 10 insertions, 12 deletions
diff --git a/kernel/sound/synth/emux/Makefile b/kernel/sound/synth/emux/Makefile
index 328594e61..fb761c2c2 100644
--- a/kernel/sound/synth/emux/Makefile
+++ b/kernel/sound/synth/emux/Makefile
@@ -4,8 +4,9 @@
#
snd-emux-synth-objs := emux.o emux_synth.o emux_seq.o emux_nrpn.o \
- emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \
- $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o)
+ emux_effect.o emux_hwdep.o soundfont.o
+snd-emux-synth-$(CONFIG_SND_PROC_FS) += emux_proc.o
+snd-emux-synth-$(CONFIG_SND_SEQUENCER_OSS) += emux_oss.o
# Toplevel Module Dependencies
obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o
diff --git a/kernel/sound/synth/emux/emux.c b/kernel/sound/synth/emux/emux.c
index 49195325f..9312cd8a6 100644
--- a/kernel/sound/synth/emux/emux.c
+++ b/kernel/sound/synth/emux/emux.c
@@ -128,9 +128,7 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
#endif
snd_emux_init_virmidi(emu, card);
-#ifdef CONFIG_PROC_FS
snd_emux_proc_init(emu, card, index);
-#endif
return 0;
}
@@ -150,9 +148,7 @@ int snd_emux_free(struct snd_emux *emu)
del_timer(&emu->tlist);
spin_unlock_irqrestore(&emu->voice_lock, flags);
-#ifdef CONFIG_PROC_FS
snd_emux_proc_free(emu);
-#endif
snd_emux_delete_virmidi(emu);
#ifdef CONFIG_SND_SEQUENCER_OSS
snd_emux_detach_seq_oss(emu);
diff --git a/kernel/sound/synth/emux/emux_oss.c b/kernel/sound/synth/emux/emux_oss.c
index 82e350e95..ac75816ad 100644
--- a/kernel/sound/synth/emux/emux_oss.c
+++ b/kernel/sound/synth/emux/emux_oss.c
@@ -69,7 +69,8 @@ snd_emux_init_seq_oss(struct snd_emux *emu)
struct snd_seq_oss_reg *arg;
struct snd_seq_device *dev;
- if (snd_seq_device_new(emu->card, 0, SNDRV_SEQ_DEV_ID_OSS,
+ /* using device#1 here for avoiding conflicts with OPL3 */
+ if (snd_seq_device_new(emu->card, 1, SNDRV_SEQ_DEV_ID_OSS,
sizeof(struct snd_seq_oss_reg), &dev) < 0)
return;
diff --git a/kernel/sound/synth/emux/emux_proc.c b/kernel/sound/synth/emux/emux_proc.c
index 58a32a10d..a82b4053b 100644
--- a/kernel/sound/synth/emux/emux_proc.c
+++ b/kernel/sound/synth/emux/emux_proc.c
@@ -24,8 +24,6 @@
#include <sound/info.h>
#include "emux_voice.h"
-#ifdef CONFIG_PROC_FS
-
static void
snd_emux_proc_info_read(struct snd_info_entry *entry,
struct snd_info_buffer *buf)
@@ -128,5 +126,3 @@ void snd_emux_proc_free(struct snd_emux *emu)
snd_info_free_entry(emu->proc);
emu->proc = NULL;
}
-
-#endif /* CONFIG_PROC_FS */
diff --git a/kernel/sound/synth/emux/emux_voice.h b/kernel/sound/synth/emux/emux_voice.h
index 09711f84e..a7073c371 100644
--- a/kernel/sound/synth/emux/emux_voice.h
+++ b/kernel/sound/synth/emux/emux_voice.h
@@ -82,9 +82,13 @@ void snd_emux_init_seq_oss(struct snd_emux *emu);
void snd_emux_detach_seq_oss(struct snd_emux *emu);
/* emux_proc.c */
-#ifdef CONFIG_PROC_FS
+#ifdef CONFIG_SND_PROC_FS
void snd_emux_proc_init(struct snd_emux *emu, struct snd_card *card, int device);
void snd_emux_proc_free(struct snd_emux *emu);
+#else
+static inline void snd_emux_proc_init(struct snd_emux *emu,
+ struct snd_card *card, int device) {}
+static inline void snd_emux_proc_free(struct snd_emux *emu) {}
#endif
#define STATE_IS_PLAYING(s) ((s) & SNDRV_EMUX_ST_ON)