mirror of https://github.com/thesofproject/sof.git
dai: make dai_info and dai_type const
Makes dai_info and dai_type structures constant. Pointer to dai array should not change during the lifetime of DSP. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
This commit is contained in:
parent
854aa7d181
commit
2095ab0df7
|
@ -125,7 +125,7 @@ struct dai_type_info {
|
||||||
* \brief Holds information about array of DAIs grouped by type.
|
* \brief Holds information about array of DAIs grouped by type.
|
||||||
*/
|
*/
|
||||||
struct dai_info {
|
struct dai_info {
|
||||||
struct dai_type_info *dai_type_array;
|
const struct dai_type_info *dai_type_array;
|
||||||
size_t num_dai_types;
|
size_t num_dai_types;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -271,7 +271,7 @@ static inline void dai_update_bits(struct dai *dai, uint32_t reg,
|
||||||
io_reg_update_bits(dai_base(dai) + reg, mask, value);
|
io_reg_update_bits(dai_base(dai) + reg, mask, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline struct dai_info *dai_info_get(void)
|
static inline const struct dai_info *dai_info_get(void)
|
||||||
{
|
{
|
||||||
return sof_get()->dai_info;
|
return sof_get()->dai_info;
|
||||||
}
|
}
|
||||||
|
|
|
@ -74,7 +74,7 @@ struct sof {
|
||||||
struct notify_data *notify_data;
|
struct notify_data *notify_data;
|
||||||
|
|
||||||
/* platform dai information */
|
/* platform dai information */
|
||||||
struct dai_info *dai_info;
|
const struct dai_info *dai_info;
|
||||||
|
|
||||||
/* platform DMA information */
|
/* platform DMA information */
|
||||||
struct dma_info *dma_info;
|
struct dma_info *dma_info;
|
||||||
|
|
|
@ -14,10 +14,10 @@
|
||||||
|
|
||||||
#define trace_dai(__e, ...) trace_event(TRACE_CLASS_DAI, __e, ##__VA_ARGS__)
|
#define trace_dai(__e, ...) trace_event(TRACE_CLASS_DAI, __e, ##__VA_ARGS__)
|
||||||
|
|
||||||
static inline struct dai_type_info *dai_find_type(uint32_t type)
|
static inline const struct dai_type_info *dai_find_type(uint32_t type)
|
||||||
{
|
{
|
||||||
struct dai_info *info = dai_info_get();
|
const struct dai_info *info = dai_info_get();
|
||||||
struct dai_type_info *dti;
|
const struct dai_type_info *dti;
|
||||||
|
|
||||||
for (dti = info->dai_type_array;
|
for (dti = info->dai_type_array;
|
||||||
dti < info->dai_type_array + info->num_dai_types; dti++) {
|
dti < info->dai_type_array + info->num_dai_types; dti++) {
|
||||||
|
@ -30,7 +30,7 @@ static inline struct dai_type_info *dai_find_type(uint32_t type)
|
||||||
struct dai *dai_get(uint32_t type, uint32_t index, uint32_t flags)
|
struct dai *dai_get(uint32_t type, uint32_t index, uint32_t flags)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
struct dai_type_info *dti;
|
const struct dai_type_info *dti;
|
||||||
struct dai *d;
|
struct dai *d;
|
||||||
|
|
||||||
dti = dai_find_type(type);
|
dti = dai_find_type(type);
|
||||||
|
|
|
@ -116,7 +116,7 @@ static struct dai ssp[] = {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct dai_type_info dti[] = {
|
const struct dai_type_info dti[] = {
|
||||||
{
|
{
|
||||||
.type = SOF_DAI_INTEL_SSP,
|
.type = SOF_DAI_INTEL_SSP,
|
||||||
.dai_array = ssp,
|
.dai_array = ssp,
|
||||||
|
@ -124,7 +124,7 @@ static struct dai_type_info dti[] = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct dai_info lib_dai = {
|
const struct dai_info lib_dai = {
|
||||||
.dai_type_array = dti,
|
.dai_type_array = dti,
|
||||||
.num_dai_types = ARRAY_SIZE(dti)
|
.num_dai_types = ARRAY_SIZE(dti)
|
||||||
};
|
};
|
||||||
|
|
|
@ -48,7 +48,7 @@ static struct dai ssp[2] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct dai_type_info dti[] = {
|
const struct dai_type_info dti[] = {
|
||||||
{
|
{
|
||||||
.type = SOF_DAI_INTEL_SSP,
|
.type = SOF_DAI_INTEL_SSP,
|
||||||
.dai_array = ssp,
|
.dai_array = ssp,
|
||||||
|
@ -56,7 +56,7 @@ static struct dai_type_info dti[] = {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct dai_info lib_dai = {
|
const struct dai_info lib_dai = {
|
||||||
.dai_type_array = dti,
|
.dai_type_array = dti,
|
||||||
.num_dai_types = ARRAY_SIZE(dti)
|
.num_dai_types = ARRAY_SIZE(dti)
|
||||||
};
|
};
|
||||||
|
|
|
@ -63,7 +63,8 @@ static struct dai sai[] = {
|
||||||
.drv = &sai_driver,
|
.drv = &sai_driver,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
static struct dai_type_info dti[] = {
|
|
||||||
|
const struct dai_type_info dti[] = {
|
||||||
{
|
{
|
||||||
.type = SOF_DAI_IMX_SAI,
|
.type = SOF_DAI_IMX_SAI,
|
||||||
.dai_array = sai,
|
.dai_array = sai,
|
||||||
|
@ -76,7 +77,7 @@ static struct dai_type_info dti[] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct dai_info lib_dai = {
|
const struct dai_info lib_dai = {
|
||||||
.dai_type_array = dti,
|
.dai_type_array = dti,
|
||||||
.num_dai_types = ARRAY_SIZE(dti)
|
.num_dai_types = ARRAY_SIZE(dti)
|
||||||
};
|
};
|
||||||
|
|
|
@ -87,7 +87,7 @@ static struct dai alh[DAI_NUM_ALH_BI_DIR_LINKS];
|
||||||
|
|
||||||
static struct dai hda[(DAI_NUM_HDA_OUT + DAI_NUM_HDA_IN)];
|
static struct dai hda[(DAI_NUM_HDA_OUT + DAI_NUM_HDA_IN)];
|
||||||
|
|
||||||
static struct dai_type_info dti[] = {
|
const struct dai_type_info dti[] = {
|
||||||
#if CONFIG_CAVS_SSP
|
#if CONFIG_CAVS_SSP
|
||||||
{
|
{
|
||||||
.type = SOF_DAI_INTEL_SSP,
|
.type = SOF_DAI_INTEL_SSP,
|
||||||
|
@ -116,7 +116,7 @@ static struct dai_type_info dti[] = {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct dai_info lib_dai = {
|
const struct dai_info lib_dai = {
|
||||||
.dai_type_array = dti,
|
.dai_type_array = dti,
|
||||||
.num_dai_types = ARRAY_SIZE(dti)
|
.num_dai_types = ARRAY_SIZE(dti)
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue