History

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

Mark Brown committed 9 years ago

Commit 460f6232 parents 39e0a0a 38a770830 files · +2419 −277Browse files

Showing the changes to include/uapi (1 of 30 files). Show all

Unified · Split

include/uapi/sound/snd_sst_tokens.h+91−1
@@ -163,8 +163,71 @@ · 162 unmodified lines
163163 *
164164 * %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec
165165 *
166+ * %SKL_TKN_U32_PIPE_DIR: Specifies pipe direction. Can be
167+ * playback/capture.
168+ *
169+ * %SKL_TKN_U32_NUM_CONFIGS: Number of pipe configs
170+ *
171+ * %SKL_TKN_U32_PATH_MEM_PGS: Size of memory (in pages) required for pipeline
172+ * and its data
173+ *
174+ * %SKL_TKN_U32_PIPE_CONFIG_ID: Config id for the modules in the pipe
175+ * and PCM params supported by that pipe
176+ * config. This is used as index to fill
177+ * up the pipe config and module config
178+ * structure.
179+ *
180+ * %SKL_TKN_U32_CFG_FREQ:
181+ * %SKL_TKN_U8_CFG_CHAN:
182+ * %SKL_TKN_U8_CFG_BPS: PCM params (freq, channels, bits per sample)
183+ * supported for each of the pipe configs.
184+ *
185+ * %SKL_TKN_CFG_MOD_RES_ID: Module's resource index for each of the
186+ * pipe config
187+ *
188+ * %SKL_TKN_CFG_MOD_FMT_ID: Module's interface index for each of the
189+ * pipe config
190+ *
191+ * %SKL_TKN_U8_NUM_MOD: Number of modules in the manifest
192+ *
193+ * %SKL_TKN_MM_U8_MOD_IDX: Current index of the module in the manifest
194+ *
195+ * %SKL_TKN_MM_U8_NUM_RES: Number of resources for the module
196+ *
197+ * %SKL_TKN_MM_U8_NUM_INTF: Number of interfaces for the module
198+ *
199+ * %SKL_TKN_MM_U32_RES_ID: Resource index for the resource info to
200+ * be filled into.
201+ * A module can support multiple resource
202+ * configuration and is represnted as a
203+ * resource table. This index is used to
204+ * fill information into appropriate index.
205+ *
206+ * %SKL_TKN_MM_U32_CPS: DSP cycles per second
207+ *
208+ * %SKL_TKN_MM_U32_DMA_SIZE: Allocated buffer size for gateway DMA
209+ *
210+ * %SKL_TKN_MM_U32_CPC: DSP cycles allocated per frame
211+ *
212+ * %SKL_TKN_MM_U32_RES_PIN_ID: Resource pin index in the module
213+ *
214+ * %SKL_TKN_MM_U32_INTF_PIN_ID: Interface index in the module
215+ *
216+ * %SKL_TKN_MM_U32_PIN_BUF: Buffer size of the module pin
217+ *
218+ * %SKL_TKN_MM_U32_FMT_ID: Format index for each of the interface/
219+ * format information to be filled into.
220+ *
221+ * %SKL_TKN_MM_U32_NUM_IN_FMT: Number of input formats
222+ * %SKL_TKN_MM_U32_NUM_OUT_FMT: Number of output formats
223+ *
166224 * module_id and loadable flags dont have tokens as these values will be
167225 * read from the DSP FW manifest
226+ *
227+ * Tokens defined can be used either in the manifest or widget private data.
228+ *
229+ * SKL_TKN_MM is used as a suffix for all tokens that represent
230+ * module data in the manifest.
168231 */
169232 enum SKL_TKNS {
170233 SKL_TKN_UUID = 1,
@@ -218,7 +281,34 @@ enum SKL_TKNS { · 47 unmodified lines
218281 SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */
219282 SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS,
220283 SKL_TKN_U32_DMA_BUF_SIZE,
221− SKL_TKN_MAX = SKL_TKN_U32_DMA_BUF_SIZE,
284+
285+ SKL_TKN_U32_PIPE_DIRECTION,
286+ SKL_TKN_U32_PIPE_CONFIG_ID,
287+ SKL_TKN_U32_NUM_CONFIGS,
288+ SKL_TKN_U32_PATH_MEM_PGS,
289+
290+ SKL_TKN_U32_CFG_FREQ,
291+ SKL_TKN_U8_CFG_CHAN,
292+ SKL_TKN_U8_CFG_BPS,
293+ SKL_TKN_CFG_MOD_RES_ID,
294+ SKL_TKN_CFG_MOD_FMT_ID,
295+ SKL_TKN_U8_NUM_MOD,
296+
297+ SKL_TKN_MM_U8_MOD_IDX,
298+ SKL_TKN_MM_U8_NUM_RES,
299+ SKL_TKN_MM_U8_NUM_INTF,
300+ SKL_TKN_MM_U32_RES_ID,
301+ SKL_TKN_MM_U32_CPS,
302+ SKL_TKN_MM_U32_DMA_SIZE,
303+ SKL_TKN_MM_U32_CPC,
304+ SKL_TKN_MM_U32_RES_PIN_ID,
305+ SKL_TKN_MM_U32_INTF_PIN_ID,
306+ SKL_TKN_MM_U32_PIN_BUF,
307+ SKL_TKN_MM_U32_FMT_ID,
308+ SKL_TKN_MM_U32_NUM_IN_FMT,
309+ SKL_TKN_MM_U32_NUM_OUT_FMT,
310+
311+ SKL_TKN_MAX = SKL_TKN_MM_U32_NUM_OUT_FMT,
222312 };
223313
224314 #endif

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