diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/sound/sound_config.h | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/sound/sound_config.h')
| -rw-r--r-- | drivers/sound/sound_config.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/sound/sound_config.h b/drivers/sound/sound_config.h index baa04be61..9ca2f3d8a 100644 --- a/drivers/sound/sound_config.h +++ b/drivers/sound/sound_config.h @@ -11,7 +11,8 @@ */ -#include "local.h" +#include "local.h.master" + #include "os.h" #include "soundvers.h" @@ -115,7 +116,9 @@ struct address_info { int driver_use_1; /* Driver defined field 1 */ int driver_use_2; /* Driver defined field 2 */ int *osp; /* OS specific info */ - int card_subtype; /* Driver spesific. Usually 0 */ + int card_subtype; /* Driver specific. Usually 0 */ + void *memptr; /* Module memory chainer */ + int slots[6]; /* To remember driver slot ids */ }; #define SYNTH_MAX_VOICES 32 @@ -145,6 +148,7 @@ struct channel_info { #define WK_SIGNAL 0x04 #define WK_SLEEP 0x08 #define WK_SELECT 0x10 +#define WK_ABORT 0x20 #define OPEN_READ PCM_ENABLE_INPUT #define OPEN_WRITE PCM_ENABLE_OUTPUT @@ -161,5 +165,17 @@ struct channel_info { #define DDB(x) {} #endif +#ifndef MDB +#ifdef MODULE +#define MDB(x) x +#else +#define MDB(x) +#endif +#endif + #define TIMER_ARMED 121234 #define TIMER_NOT_ARMED 1 + + + + |