Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/audio/dai-zephyr.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ static int dai_trigger_op(struct dai *dai, int cmd, int direction)

/* called from src/ipc/ipc3/handler.c and src/ipc/ipc4/dai.c */
__cold int dai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
const void *spec_config)
const void *spec_config, size_t size)
{
const struct device *dev = dai->dev;
const struct sof_ipc_dai_config *sof_cfg = spec_config;
Expand Down Expand Up @@ -198,7 +198,7 @@ __cold int dai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
return -EINVAL;
}

return dai_config_set(dev, &cfg, cfg_params);
return dai_config_set(dev, &cfg, cfg_params, size);
}

/* called from ipc/ipc3/dai.c */
Expand Down
2 changes: 1 addition & 1 deletion src/include/sof/lib/dai-legacy.h
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ void dai_put(struct dai *dai);
* \brief Digital Audio interface formatting
*/
static inline int dai_set_config(struct dai *dai, struct ipc_config_dai *config,
const void *spec_config)
const void *spec_config, size_t size)
{
return dai->drv->ops.set_config(dai, config, spec_config);
}
Expand Down
3 changes: 2 additions & 1 deletion src/include/sof/lib/dai-zephyr.h
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ void dai_put(struct dai *dai);
/**
* \brief Digital Audio interface formatting
*/
int dai_set_config(struct dai *dai, struct ipc_config_dai *config, const void *spec_config);
int dai_set_config(struct dai *dai, struct ipc_config_dai *config,
const void *spec_config, size_t size);

/**
* \brief Get Digital Audio interface DMA Handshake
Expand Down
2 changes: 1 addition & 1 deletion src/ipc/ipc3/handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ static int ipc_dai_config_set(struct sof_ipc_dai_config *config,
}

/* configure DAI */
ret = dai_set_config(dai, config_dai, config);
ret = dai_set_config(dai, config_dai, config, sizeof(*config));
dai_put(dai); /* free ref immediately */
if (ret < 0) {
ipc_cmd_err(&ipc_tr, "ipc: dai %d,%d config failed %d", config->type,
Expand Down
3 changes: 2 additions & 1 deletion src/ipc/ipc4/dai.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@ __cold int dai_config(struct dai_data *dd, struct comp_dev *dev,
if (ret < 0)
return ret;

return dai_set_config(dd->dai, common_config, copier_cfg->gtw_cfg.config_data);
return dai_set_config(dd->dai, common_config,
copier_cfg->gtw_cfg.config_data, copier_cfg->gtw_cfg.config_length);
}

#if CONFIG_ZEPHYR_NATIVE_DRIVERS
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: af974c307477f4e0e093abbfca768419f14a865f
revision: f908d0b5f22adaaf912e729317c323864f1e1641
remote: zephyrproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down