patch-2.3.48 linux/drivers/sound/mpu401.c
Next file: linux/drivers/sound/opl3.c
Previous file: linux/drivers/sound/midibuf.c
Back to the patch index
Back to the overall index
- Lines: 60
- Date:
Thu Feb 24 22:12:57 2000
- Orig file:
v2.3.47/linux/drivers/sound/mpu401.c
- Orig date:
Thu Aug 26 13:05:39 1999
diff -u --recursive --new-file v2.3.47/linux/drivers/sound/mpu401.c linux/drivers/sound/mpu401.c
@@ -24,15 +24,11 @@
#include "sound_config.h"
#include "soundmodule.h"
-#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
#include "coproc.h"
-#ifdef CONFIG_SEQUENCER
static int timer_mode = TMR_INTERNAL, timer_caps = TMR_INTERNAL;
-#endif
-
struct mpu_config
{
int base; /*
@@ -159,9 +155,6 @@
0 /* Fx */
};
-#ifndef CONFIG_SEQUENCER
-#define STORE(cmd)
-#else
#define STORE(cmd) \
{ \
int len; \
@@ -169,7 +162,6 @@
cmd; \
seq_input_event(obuf, len); \
}
-#endif
#define _seqbuf obuf
#define _seqbufptr 0
@@ -1225,8 +1217,6 @@
* Timer stuff
****************************************************/
-#if defined(CONFIG_SEQUENCER)
-
static volatile int timer_initialized = 0, timer_open = 0, tmr_running = 0;
static volatile int curr_tempo, curr_timebase, hw_timebase;
static int max_timebase = 8; /* 8*24=192 ppqn */
@@ -1718,9 +1708,6 @@
}
-#endif
-
-
EXPORT_SYMBOL(probe_mpu401);
EXPORT_SYMBOL(attach_mpu401);
EXPORT_SYMBOL(unload_mpu401);
@@ -1762,5 +1749,4 @@
SOUND_LOCK_END;
}
-#endif
-#endif
+#endif /* MODULE */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)