Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d0b8e02 authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

ANDROID: GKI: sound: soc: Resolve ABI diff for struct snd_compr_stream 



Also resolves ABI diff for struct snd_soc_dai_link.
Also adds a new member to struct snd_soc_pcm_runtime to reduce ABI diff.

Test: build
Bug: 151372815
Signed-off-by: default avatarWalter Yang <yandongy@codeaurora.org>
Signed-off-by: default avatarFred Oh <fred@codeaurora.org>
Signed-off-by: default avatarBanajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: default avatarMeng Wang <mwang@codeaurora.org>
Change-Id: I2b523cff2dba1ac45209cf5acb5331e2ed5267e9
(cherry picked from commit 11323a08)
[hridya: amended to only include ABI diff]
Signed-off-by: default avatarHridya Valsaraju <hridya@google.com>
parent 0d9deda2

include/sound/compress_driver.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct snd_compr_stream { 
	bool metadata_set;

	bool next_track;

	void *private_data;

	struct snd_soc_pcm_runtime *be;

};



/**

include/sound/soc.h

+13 −0
Original line number Diff line number Diff line
@@ -889,6 +889,14 @@ struct snd_soc_dai_link_component { 
	const char *dai_name;

};



enum snd_soc_async_ops {

	ASYNC_DPCM_SND_SOC_OPEN = 1 << 0,

	ASYNC_DPCM_SND_SOC_CLOSE = 1 << 1,

	ASYNC_DPCM_SND_SOC_PREPARE = 1 << 2,

	ASYNC_DPCM_SND_SOC_HW_PARAMS = 1 << 3,

	ASYNC_DPCM_SND_SOC_FREE = 1 << 4,

};



struct snd_soc_dai_link {

	/* config - must be set by machine driver */

	const char *name;			/* Codec name */
@@ -987,6 +995,9 @@ struct snd_soc_dai_link { 


	struct list_head list; /* DAI link list of the soc card */

	struct snd_soc_dobj dobj; /* For topology */



	/* this value determines what all ops can be started asynchronously */

	enum snd_soc_async_ops async_ops;

};



struct snd_soc_codec_conf {
@@ -1142,6 +1153,8 @@ struct snd_soc_pcm_runtime { 


	long pmdown_time;



	/* err in case of ops failed */

	int err_ops;

	/* runtime devices */

	struct snd_pcm *pcm;

	struct snd_compr *compr;