diff options
| author | Liam Girdwood <lrg@ti.com> | 2011-01-31 20:33:07 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:06:12 -0700 |
| commit | 8895ae53fc50078a23a8cd92c847c44954f32ed1 (patch) | |
| tree | 45252b8f0108331cd4b9d9439ae3bcb2963179c9 /include/sound | |
| parent | 7bc2b53d27569cc334d15b26e94638644b0ea89a (diff) | |
| download | kernel_samsung_espresso10-8895ae53fc50078a23a8cd92c847c44954f32ed1.zip kernel_samsung_espresso10-8895ae53fc50078a23a8cd92c847c44954f32ed1.tar.gz kernel_samsung_espresso10-8895ae53fc50078a23a8cd92c847c44954f32ed1.tar.bz2 | |
ASoC: dapm - Add API call to query valid DAPM paths
In preparation for ASoC DSP support.
Add a DAPM API call to determine whether a DAPM audio path is valid between
source and sink widgets. This also takes into account all kcontrol mux and mixer
settings in between the source and sink widgets to validate the audio path.
This will be used by the DSP core to determine the runtime DAI mappings
between FE and BE DAIs in order to run PCM operations.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 4321420..7800e79 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -310,6 +310,7 @@ struct snd_soc_dapm_path; struct snd_soc_dapm_pin; struct snd_soc_dapm_route; struct snd_soc_dapm_context; +struct snd_soc_dapm_widget_list; int dapm_reg_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event); @@ -348,6 +349,8 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm); void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm); int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_route *route, int num); +int snd_soc_dapm_query_path(struct snd_soc_dapm_context *dapm, + const char *source_name, const char *sink_name, int stream); const char *snd_soc_dapm_get_aif(struct snd_soc_dapm_context *dapm, const char *stream_name, enum snd_soc_dapm_type type); @@ -375,6 +378,13 @@ int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin); +/* dapm path query */ +int snd_soc_dapm_get_connected_widgets_type(struct snd_soc_dapm_context *dapm, + const char *stream_name, struct snd_soc_dapm_widget_list **list, + int stream, enum snd_soc_dapm_type type); +int snd_soc_dapm_get_connected_widgets_name(struct snd_soc_dapm_context *dapm, + const char *name, struct snd_soc_dapm_widget_list **list, int stream); + /* dapm widget types */ enum snd_soc_dapm_type { snd_soc_dapm_input = 0, /* input pin */ @@ -431,6 +441,7 @@ struct snd_soc_dapm_path { /* status */ u32 connect:1; /* source and sink widgets are connected */ u32 walked:1; /* path has been walked */ + u32 length:6; /* path length - used by route mapper */ int (*connected)(struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink); @@ -455,6 +466,8 @@ struct snd_soc_dapm_widget { unsigned char shift; /* bits to shift */ unsigned int saved_value; /* widget saved value */ unsigned int value; /* widget current value */ + unsigned int path_idx; + unsigned int hops; unsigned int mask; /* non-shifted mask */ unsigned int on_val; /* on state value */ unsigned int off_val; /* off state value */ @@ -510,12 +523,15 @@ struct snd_soc_dapm_context { struct device *dev; /* from parent - for debug */ struct snd_soc_codec *codec; /* parent codec */ + struct snd_soc_platform *platform; /*parent platform */ struct snd_soc_card *card; /* parent card */ /* used during DAPM updates */ int dev_power; struct list_head list; + int num_valid_paths; + int (*stream_event)(struct snd_soc_dapm_context *dapm); #ifdef CONFIG_DEBUG_FS |