diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ac97_codec.h | 41 | ||||
| -rw-r--r-- | include/sound/asound.h | 3 | ||||
| -rw-r--r-- | include/sound/emu10k1.h | 2 | ||||
| -rw-r--r-- | include/sound/pcm_oss.h | 4 |
4 files changed, 45 insertions, 5 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index e41e774307ee..b73755aa7f3b 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -214,10 +214,46 @@ #define AC97_CXR_SPDIF_AC3 0x2 /* specific - ALC */ +#define AC97_ALC650_SPDIF_INPUT_STATUS1 0x60 +/* S/PDIF input status 1 bit defines */ +#define AC97_ALC650_PRO 0x0001 /* Professional status */ +#define AC97_ALC650_NAUDIO 0x0002 /* Non audio stream */ +#define AC97_ALC650_COPY 0x0004 /* Copyright status */ +#define AC97_ALC650_PRE 0x0038 /* Preemphasis status */ +#define AC97_ALC650_PRE_SHIFT 3 +#define AC97_ALC650_MODE 0x00C0 /* Preemphasis status */ +#define AC97_ALC650_MODE_SHIFT 6 +#define AC97_ALC650_CC_MASK 0x7f00 /* Category Code mask */ +#define AC97_ALC650_CC_SHIFT 8 +#define AC97_ALC650_L 0x8000 /* Generation Level status */ + +#define AC97_ALC650_SPDIF_INPUT_STATUS2 0x62 +/* S/PDIF input status 2 bit defines */ +#define AC97_ALC650_SOUCE_MASK 0x000f /* Source number */ +#define AC97_ALC650_CHANNEL_MASK 0x00f0 /* Channel number */ +#define AC97_ALC650_CHANNEL_SHIFT 4 +#define AC97_ALC650_SPSR_MASK 0x0f00 /* S/PDIF Sample Rate bits */ +#define AC97_ALC650_SPSR_SHIFT 8 +#define AC97_ALC650_SPSR_44K 0x0000 /* Use 44.1kHz Sample rate */ +#define AC97_ALC650_SPSR_48K 0x0200 /* Use 48kHz Sample rate */ +#define AC97_ALC650_SPSR_32K 0x0300 /* Use 32kHz Sample rate */ +#define AC97_ALC650_CLOCK_ACCURACY 0x3000 /* Clock accuracy */ +#define AC97_ALC650_CLOCK_SHIFT 12 +#define AC97_ALC650_CLOCK_LOCK 0x4000 /* Clock locked status */ +#define AC97_ALC650_V 0x8000 /* Validity status */ + #define AC97_ALC650_SURR_DAC_VOL 0x64 #define AC97_ALC650_LFE_DAC_VOL 0x66 -#define AC97_ALC650_MULTICH 0x6a -#define AC97_ALC650_CLOCK 0x7a +#define AC97_ALC650_UNKNOWN1 0x68 +#define AC97_ALC650_MULTICH 0x6a +#define AC97_ALC650_UNKNOWN2 0x6c +#define AC97_ALC650_REVISION 0x6e +#define AC97_ALC650_UNKNOWN3 0x70 +#define AC97_ALC650_UNKNOWN4 0x72 +#define AC97_ALC650_MISC 0x74 +#define AC97_ALC650_GPIO_SETUP 0x76 +#define AC97_ALC650_GPIO_STATUS 0x78 +#define AC97_ALC650_CLOCK 0x7a /* specific - Yamaha YMF753 */ #define AC97_YMF753_DIT_CTRL2 0x66 /* DIT Control 2 */ @@ -248,6 +284,7 @@ #define AC97_AD_MULTI (1<<1) /* Analog Devices - multi codecs */ #define AC97_CS_SPDIF (1<<2) /* Cirrus Logic uses funky SPDIF */ #define AC97_CX_SPDIF (1<<3) /* Conexant's spdif interface */ +#define AC97_STEREO_MUTES (1<<4) /* has stereo mute bits */ /* rates indexes */ #define AC97_RATES_FRONT_DAC 0 diff --git a/include/sound/asound.h b/include/sound/asound.h index 99547ab3e252..b68826ba1904 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -106,9 +106,10 @@ enum sndrv_hwdep_iface { SNDRV_HWDEP_IFACE_SSCAPE, /* Ensoniq SoundScape ISA card (MC68EC000) */ SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ + SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */ /* Don't forget to change the following: */ - SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_MIXART, + SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USX2Y, }; struct sndrv_hwdep_info { diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 1fbd9f3fa82b..78078e874480 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1152,6 +1152,8 @@ int snd_emu10k1_proc_init(emu10k1_t * emu); #define FXBUS_MIDI_RIGHT 0x05 #define FXBUS_PCM_CENTER 0x06 #define FXBUS_PCM_LFE 0x07 +#define FXBUS_PT_LEFT 20 +#define FXBUS_PT_RIGHT 21 #define FXBUS_MIDI_REVERB 0x0c #define FXBUS_MIDI_CHORUS 0x0d diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h index ca4922049423..631c9faf7dcf 100644 --- a/include/sound/pcm_oss.h +++ b/include/sound/pcm_oss.h @@ -51,11 +51,11 @@ typedef struct _snd_pcm_oss_runtime { unsigned int subdivision; /* requested subdivision */ size_t period_bytes; /* requested period size */ unsigned int periods; - size_t buffer_bytes; /* requested period size */ + size_t buffer_bytes; /* requested buffer size */ size_t bytes; /* total # bytes processed */ size_t mmap_bytes; char *buffer; /* vmallocated period */ - size_t buffer_used; /* used length from buffer */ + size_t buffer_used; /* used length from period buffer */ snd_pcm_plugin_t *plugin_first; snd_pcm_plugin_t *plugin_last; unsigned int prev_hw_ptr_interrupt; |