diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2002-10-01 02:06:08 -0700 |
|---|---|---|
| committer | Jaroslav Kysela <perex@pnote.perex-int.cz> | 2002-10-01 02:06:08 -0700 |
| commit | 7d133b7c2aea8c324279023e39309dfb922dcc6d (patch) | |
| tree | 5a4e769ea7519b912b449a648f1af60d6d444e41 /include | |
| parent | b35a63014bd17bbc19eb536b915c2d1c0e6ed06e (diff) | |
[PATCH] ALSA update [2/12] - 2002/08/12
- removed __NO_VERSION__
- CS46xx
- SDPIF input support, only 48khz
- PCM multichannel bug fix
- EMU10K1
- Added workaround for EMU10K1 capture (wrong pointer)
- Keywest (PPC)
- fixed the initialization of driver
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/cs46xx.h | 14 | ||||
| -rw-r--r-- | include/sound/cs46xx_dsp_spos.h | 20 | ||||
| -rw-r--r-- | include/sound/emu10k1.h | 3 | ||||
| -rw-r--r-- | include/sound/version.h | 2 |
4 files changed, 33 insertions, 6 deletions
diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h index e4b0eb891e08..48caef1965b2 100644 --- a/include/sound/cs46xx.h +++ b/include/sound/cs46xx.h @@ -1710,9 +1710,12 @@ #define CS46XX_SECONDARY_CODEC_OFFSET 0x80 #define CS46XX_DSP_CAPTURE_CHANNEL 1 -/* - * - */ +/* capture */ +#define CS46XX_DSP_CAPTURE_CHANNEL 1 + +/* mixer */ +#define CS46XX_MIXER_SPDIF_INPUT_ELEMENT 1 +#define CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT 2 typedef struct _snd_cs46xx cs46xx_t; @@ -1809,8 +1812,11 @@ struct _snd_cs46xx { #ifdef CONFIG_PM struct pm_dev *pm_dev; #endif - +#ifdef CONFIG_SND_CS46XX_DEBUG_GPIO + int current_gpio; +#endif #ifdef CONFIG_SND_CS46XX_NEW_DSP + void (*mixer_init)(cs46xx_t *); dsp_spos_instance_t * dsp_spos_instance; #else /* for compatibility */ cs46xx_pcm_t *playback_pcm; diff --git a/include/sound/cs46xx_dsp_spos.h b/include/sound/cs46xx_dsp_spos.h index a1ae8ebe0bd4..bc53d416b8b6 100644 --- a/include/sound/cs46xx_dsp_spos.h +++ b/include/sound/cs46xx_dsp_spos.h @@ -177,6 +177,26 @@ typedef struct _dsp_spos_instance_t { /* SPDIF status */ int spdif_status_out; int spdif_status_in; + + /* SPDIF input sample rate converter */ + dsp_scb_descriptor_t * spdif_in_src; + /* SPDIF input asynch. receiver */ + dsp_scb_descriptor_t * asynch_rx_scb; + + /* Capture record mixer SCB */ + dsp_scb_descriptor_t * record_mixer_scb; + + /* CODEC input SCB */ + dsp_scb_descriptor_t * codec_in_scb; + + /* reference snooper */ + dsp_scb_descriptor_t * ref_snoop_scb; + + /* record sources */ + dsp_scb_descriptor_t * pcm_input; + dsp_scb_descriptor_t * adc_input; + + int spdif_in_sample_rate; } dsp_spos_instance_t; #endif /* __DSP_SPOS_H__ */ diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index a26031cd7bd6..1a123023d98d 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -795,7 +795,8 @@ struct _snd_emu10k1_pcm { snd_pcm_substream_t *substream; emu10k1_voice_t *voices[2]; emu10k1_voice_t *extra; - int running; + unsigned short running; + unsigned short first_ptr; snd_util_memblk_t *memblk; unsigned int start_addr; unsigned int ccca_start_addr; diff --git a/include/sound/version.h b/include/sound/version.h index ace6b2e5668b..86ed238828b1 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.0rc2" -#define CONFIG_SND_DATE " (Fri Aug 09 11:49:03 2002 UTC)" +#define CONFIG_SND_DATE " (Mon Aug 12 16:33:34 2002 UTC)" |