History

ASoC: topology: Support topology file of ABI v4

Users start to use topology ABI from v4. ABI v5 updated existing manifest and PCM elements. Two previous patches can support these ABI updates in a backward compatible way. So if the topology file from user space is generated by ABI v4, kernel will no longer quit but continue parsing.

Mengdong Lin committed 10 years ago

Commit 288b8da1 parent 8f27c4a2 files · +5 −2Browse files

Unified · Split

2 files
  1. include/uapi/sound/asoc.h +2 −1
  2. sound/soc/soc-topology.c +3 −1
include/uapi/sound/asoc.h+2−1
@@ -83,7 +83,8 @@ · 82 unmodified lines
83#define SND_SOC_TPLG_NUM_TEXTS 1683#define SND_SOC_TPLG_NUM_TEXTS 16
84 84
85/* ABI version */85/* ABI version */
86#define SND_SOC_TPLG_ABI_VERSION 0x586#define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */
87#define SND_SOC_TPLG_ABI_VERSION_MIN 0x4 /* oldest version supported */
87 88
88/* Max size of TLV data */89/* Max size of TLV data */
89#define SND_SOC_TPLG_TLV_SIZE 3290#define SND_SOC_TPLG_TLV_SIZE 32
sound/soc/soc-topology.c+3−1
@@ -2056,7 +2056,9 @@ static int soc_valid_header(struct soc_tplg *tplg, · 2055 unmodified lines
2056 return -EINVAL;2056 return -EINVAL;
2057 }2057 }
2058 2058
2059 if (hdr->abi != SND_SOC_TPLG_ABI_VERSION) {2059 /* Support ABI from version 4 */
2060 if (hdr->abi > SND_SOC_TPLG_ABI_VERSION
2061 || hdr->abi < SND_SOC_TPLG_ABI_VERSION_MIN) {
2060 dev_err(tplg->dev,2062 dev_err(tplg->dev,
2061 "ASoC: pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n",2063 "ASoC: pass %d invalid ABI version got 0x%x need 0x%x at offset 0x%lx size 0x%zx.\n",
2062 tplg->pass, hdr->abi,2064 tplg->pass, hdr->abi,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t