summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
506e6ae)
Build emux_proc.o and drop the unneeded ifdefs.
Replace the left CONFIG_PROC with the new CONFIG_SND_PROC_FS.
Along with this, fix the build of emux_oss.o in Makefile, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
struct snd_util_memhdr *memhdr; /* memory chunk information */
struct snd_util_memhdr *memhdr; /* memory chunk information */
+#ifdef CONFIG_SND_PROC_FS
struct snd_info_entry *proc;
#endif
struct snd_info_entry *proc;
#endif
#
snd-emux-synth-objs := 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 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
# Toplevel Module Dependencies
obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o
#endif
snd_emux_init_virmidi(emu, card);
#endif
snd_emux_init_virmidi(emu, card);
snd_emux_proc_init(emu, card, index);
snd_emux_proc_init(emu, card, index);
del_timer(&emu->tlist);
spin_unlock_irqrestore(&emu->voice_lock, flags);
del_timer(&emu->tlist);
spin_unlock_irqrestore(&emu->voice_lock, flags);
snd_emux_delete_virmidi(emu);
#ifdef CONFIG_SND_SEQUENCER_OSS
snd_emux_detach_seq_oss(emu);
snd_emux_delete_virmidi(emu);
#ifdef CONFIG_SND_SEQUENCER_OSS
snd_emux_detach_seq_oss(emu);
#include <sound/info.h>
#include "emux_voice.h"
#include <sound/info.h>
#include "emux_voice.h"
static void
snd_emux_proc_info_read(struct snd_info_entry *entry,
struct snd_info_buffer *buf)
static void
snd_emux_proc_info_read(struct snd_info_entry *entry,
struct snd_info_buffer *buf)
snd_info_free_entry(emu->proc);
emu->proc = NULL;
}
snd_info_free_entry(emu->proc);
emu->proc = NULL;
}
-
-#endif /* CONFIG_PROC_FS */
void snd_emux_detach_seq_oss(struct snd_emux *emu);
/* emux_proc.c */
void snd_emux_detach_seq_oss(struct snd_emux *emu);
/* emux_proc.c */
+#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);
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)
#endif
#define STATE_IS_PLAYING(s) ((s) & SNDRV_EMUX_ST_ON)