summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.h
diff options
context:
space:
mode:
authorTakashi Iwai2008-11-27 14:17:01 +0100
committerTakashi Iwai2008-11-27 14:17:01 +0100
commit529bd6c4a63f8468fd66f63fdc22d7070439b3cd (patch)
tree3a45f17bbd45ef3e4ea785ce0bb79e6afef3e438 /sound/pci/hda/hda_codec.h
parentALSA: hda - Move power_save option to hda_intel.c (diff)
downloadkernel-qcow2-linux-529bd6c4a63f8468fd66f63fdc22d7070439b3cd.tar.gz
kernel-qcow2-linux-529bd6c4a63f8468fd66f63fdc22d7070439b3cd.tar.xz
kernel-qcow2-linux-529bd6c4a63f8468fd66f63fdc22d7070439b3cd.zip
ALSA: hda - Fix PCM reconfigure
The reconfiguration of PCM affected all PCM streams on the bus, but this this should be done rather only for the target codec. This patch does the following: - introduce bitmap indicating the PCM device usages on a hda_bus - refactor the PCM build functions - fix __devinit prefix in some fucntions - add a proper ifdef around HDA-reconfig-specific functions Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r--sound/pci/hda/hda_codec.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 4034625b5997..9fe0b67bb1e4 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -617,6 +617,9 @@ struct hda_bus {
struct snd_info_entry *proc;
+ /* assigned PCMs */
+ DECLARE_BITMAP(pcm_dev_bits, SNDRV_PCM_DEVICES);
+
/* misc op flags */
unsigned int needs_damn_long_delay :1;
unsigned int shutdown :1; /* being unloaded */
@@ -846,6 +849,7 @@ int snd_hda_codec_build_controls(struct hda_codec *codec);
* PCM
*/
int snd_hda_build_pcms(struct hda_bus *bus);
+int snd_hda_codec_build_pcms(struct hda_codec *codec);
void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
u32 stream_tag,
int channel_id, int format);