diff options
| author | Subhransu S. Prusty <subhransu.s.prusty@intel.com> | 2016-03-04 15:29:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-07 15:41:32 +0100 |
| commit | 828cb4edd8074d35f814e03bee3e2ad8b7d8f64b (patch) | |
| tree | 2a6186ab061ca0e2f08fdbbf91fcb9528d4135e2 /include/sound | |
| parent | ALSA: hda - Add hdmi chmap verb programming ops to chmap object (diff) | |
| download | linux-828cb4edd8074d35f814e03bee3e2ad8b7d8f64b.tar.xz linux-828cb4edd8074d35f814e03bee3e2ad8b7d8f64b.zip | |
ALSA: hda - chmap helper args modified to use generic hdac objs.
Chmap helper arguments are modified to use either hdac_device
object or hdac_chmap object instead of codec specific object.
With this moving these APIs to core will be easier.
Helper added to access a specific channel_allocation object
instead of directly accessing.
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hda_chmap.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/sound/hda_chmap.h b/include/sound/hda_chmap.h index 7afffb90921f..f7fd752fc817 100644 --- a/include/sound/hda_chmap.h +++ b/include/sound/hda_chmap.h @@ -7,6 +7,9 @@ #include <sound/hdaudio.h> + +#define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80 + struct hdac_cea_channel_speaker_allocation { int ca_index; int speakers[8]; @@ -24,12 +27,13 @@ struct hdac_chmap_ops { */ int (*chmap_cea_alloc_validate_get_type)(struct hdac_chmap *chmap, struct hdac_cea_channel_speaker_allocation *cap, int channels); - void (*cea_alloc_to_tlv_chmap) - (struct hdac_cea_channel_speaker_allocation *cap, + void (*cea_alloc_to_tlv_chmap)(struct hdac_chmap *hchmap, + struct hdac_cea_channel_speaker_allocation *cap, unsigned int *chmap, int channels); /* check that the user-given chmap is supported */ - int (*chmap_validate)(int ca, int channels, unsigned char *chmap); + int (*chmap_validate)(struct hdac_chmap *hchmap, int ca, + int channels, unsigned char *chmap); void (*get_chmap)(struct hdac_device *hdac, int pcm_idx, unsigned char *chmap); |