diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2002-10-01 02:08:06 -0700 |
|---|---|---|
| committer | Jaroslav Kysela <perex@pnote.perex-int.cz> | 2002-10-01 02:08:06 -0700 |
| commit | a2755d791481090630b96679a8d7df1d25cfe1aa (patch) | |
| tree | 6aac1c8cf0215cef78b9035ade724ead641d359d /include | |
| parent | 16a8f371127027c0f813d4fa9d1825b141eb4fea (diff) | |
[PATCH] ALSA update [6/12] - 2002/08/21
- CS46xx
- SPDIF input fixes
- fixed missplaced #ifndef
- amplifier fix for Game Theater XP
- refine on the PCM multichannel functionality
- EMU10K1
- added the support for Audigy spdif controls
- PCM midlevel
- fixed hw_free (wrong state for drivers with no callback
- fixed sw_params (runtime) lock
- AC'97 codec
- fixed spin deadlock
- CS4281
- fixed wrong mdelays and allowed scheduling in module_init
- PPC drivers
- added the missing inclusion of linux/slab.h
- USB MIDI driver
- replaced urb_t -> struct urb
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/cs46xx_dsp_spos.h | 1 | ||||
| -rw-r--r-- | include/sound/emu10k1.h | 4 | ||||
| -rw-r--r-- | include/sound/sndmagic.h | 7 | ||||
| -rw-r--r-- | include/sound/version.h | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/include/sound/cs46xx_dsp_spos.h b/include/sound/cs46xx_dsp_spos.h index bc53d416b8b6..5c15b284d7c8 100644 --- a/include/sound/cs46xx_dsp_spos.h +++ b/include/sound/cs46xx_dsp_spos.h @@ -177,6 +177,7 @@ typedef struct _dsp_spos_instance_t { /* SPDIF status */ int spdif_status_out; int spdif_status_in; + u32 spdif_input_volume; /* SPDIF input sample rate converter */ dsp_scb_descriptor_t * spdif_in_src; diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 1a123023d98d..3fbded80ec8c 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1195,8 +1195,12 @@ int snd_emu10k1_proc_done(emu10k1_t * emu); #define A_EXTIN_AC97_R 0x01 /* AC'97 capture channel - right */ #define A_EXTIN_SPDIF_CD_L 0x02 /* digital CD left */ #define A_EXTIN_SPDIF_CD_R 0x03 /* digital CD left */ +#define A_EXTIN_OPT_SPDIF_L 0x04 /* audigy drive Optical SPDIF - left */ +#define A_EXTIN_OPT_SPDIF_R 0x05 /* right */ #define A_EXTIN_LINE2_L 0x08 /* audigy drive line2/mic2 - left */ #define A_EXTIN_LINE2_R 0x09 /* right */ +#define A_EXTIN_RCA_SPDIF_L 0x0a /* audigy drive RCA SPDIF - left */ +#define A_EXTIN_RCA_SPDIF_R 0x0b /* right */ #define A_EXTIN_AUX2_L 0x0c /* audigy drive aux2 - left */ #define A_EXTIN_AUX2_R 0x0d /* - right */ diff --git a/include/sound/sndmagic.h b/include/sound/sndmagic.h index 145f663ebced..28615dadd839 100644 --- a/include/sound/sndmagic.h +++ b/include/sound/sndmagic.h @@ -137,6 +137,13 @@ static inline int _snd_magic_bad(void *obj, unsigned long magic) #define sa11xx_uda1341_t_magic 0xa15a3b00 #define uda1341_t_magic 0xa15a3c00 #define l3_client_t_magic 0xa15a3d00 +#define snd_usb_audio_t_magic 0xa15a3e01 +#define usb_mixer_elem_info_t_magic 0xa15a3e02 +#define snd_usb_stream_t_magic 0xa15a3e03 +#define usbmidi_t_magic 0xa15a3f01 +#define usbmidi_out_endpoint_t_magic 0xa15a3f02 +#define usbmidi_in_endpoint_t_magic 0xa15a3f03 + #else diff --git a/include/sound/version.h b/include/sound/version.h index b13680ba6d57..767efa35a165 100644 --- a/include/sound/version.h +++ b/include/sound/version.h @@ -1,3 +1,3 @@ /* include/version.h. Generated automatically by configure. */ #define CONFIG_SND_VERSION "0.9.0rc3" -#define CONFIG_SND_DATE " (Thu Aug 15 19:10:53 2002 UTC)" +#define CONFIG_SND_DATE " (Wed Aug 21 14:00:18 2002 UTC)" |