OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dai-zephyr/dai-legacy: Split the dai_new() function 

Split the dai_new() function to add a helper function, dai_zephyr_new()
in preparation for this to be called from both a DAI device and copier
device.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-05-02 09:39:02 -07:00 committed by Kai Vehmanen
parent 39f81954c4
commit f7e47aa6af
2 changed files with 75 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/audio/dai-legacy.c
View File

@ -160,6 +160,39 @@ static void dai_dma_cb(void *arg, enum notify_id type, void *data)
buffer_release(dma_buf);
}
static int dai_zephyr_new(struct dai_data *dd, struct comp_dev *dev,
const struct ipc_config_dai *dai)
{
uint32_t dir, caps, dma_dev;
dd->dai = dai_get(dai->type, dai->dai_index, DAI_CREAT);
if (!dd->dai) {
comp_cl_err(&comp_dai, "dai_new(): dai_get() failed to create DAI.");
return -ENODEV;
}
dd->dai->dd = dd;
dd->ipc_config = *dai;
/* request GP LP DMA with shared access privilege */
dir = dai->direction == SOF_IPC_STREAM_PLAYBACK ?
DMA_DIR_MEM_TO_DEV : DMA_DIR_DEV_TO_MEM;
caps = dai_get_info(dd->dai, DAI_INFO_DMA_CAPS);
dma_dev = dai_get_info(dd->dai, DAI_INFO_DMA_DEV);
dd->dma = dma_get(dir, caps, dma_dev, DMA_ACCESS_SHARED);
if (!dd->dma) {
comp_cl_err(&comp_dai, "dai_new(): dma_get() failed to get shared access to DMA.");
return -ENODEV;
}
dma_sg_init(&dd->config.elem_array);
dd->xrun = 0;
dd->chan = NULL;
return 0;
}
static struct comp_dev *dai_new(const struct comp_driver *drv,
const struct comp_ipc_config *config,
const void *spec)
@ -167,7 +200,7 @@ static struct comp_dev *dai_new(const struct comp_driver *drv,
struct comp_dev *dev;
const struct ipc_config_dai *dai = spec;
struct dai_data *dd;
uint32_t dir, caps, dma_dev;
int ret;
comp_cl_dbg(&comp_dai, "dai_new()");
@ -184,30 +217,9 @@ static struct comp_dev *dai_new(const struct comp_driver *drv,
comp_set_drvdata(dev, dd);
dd->dai = dai_get(dai->type, dai->dai_index, DAI_CREAT);
if (!dd->dai) {
comp_cl_err(&comp_dai, "dai_new(): dai_get() failed to create DAI.");
ret = dai_zephyr_new(dd, dev, dai);
if (ret < 0)
goto error;
}
dd->dai->dd = dd;
dd->ipc_config = *dai;
/* request GP LP DMA with shared access privilege */
dir = dai->direction == SOF_IPC_STREAM_PLAYBACK ?
DMA_DIR_MEM_TO_DEV : DMA_DIR_DEV_TO_MEM;
caps = dai_get_info(dd->dai, DAI_INFO_DMA_CAPS);
dma_dev = dai_get_info(dd->dai, DAI_INFO_DMA_DEV);
dd->dma = dma_get(dir, caps, dma_dev, DMA_ACCESS_SHARED);
if (!dd->dma) {
comp_cl_err(&comp_dai, "dai_new(): dma_get() failed to get shared access to DMA.");
goto error;
}
dma_sg_init(&dd->config.elem_array);
dd->xrun = 0;
dd->chan = NULL;
dev->state = COMP_STATE_READY;
return dev;

64
src/audio/dai-zephyr.c
View File

@ -284,34 +284,15 @@ static enum dma_cb_status dai_dma_cb(struct comp_dev *dev, uint32_t bytes)
return dma_status;
}
static struct comp_dev *dai_new(const struct comp_driver *drv,
const struct comp_ipc_config *config,
const void *spec)
static int dai_zephyr_new(struct dai_data *dd, struct comp_dev *dev,
const struct ipc_config_dai *dai_cfg)
{
struct comp_dev *dev;
const struct ipc_config_dai *dai_cfg = spec;
struct dai_data *dd;
uint32_t dir;
comp_cl_dbg(&comp_dai, "dai_new()");
dev = comp_alloc(drv, sizeof(*dev));
if (!dev)
return NULL;
dev->ipc_config = *config;
dd = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM, sizeof(*dd));
if (!dd) {
rfree(dev);
return NULL;
}
comp_set_drvdata(dev, dd);
dd->dai = dai_get(dai_cfg->type, dai_cfg->dai_index, DAI_CREAT);
if (!dd->dai) {
comp_cl_err(&comp_dai, "dai_new(): dai_get() failed to create DAI.");
goto error;
comp_err(dev, "dai_new(): dai_get() failed to create DAI.");
return -ENODEV;
}
dd->ipc_config = *dai_cfg;
@ -322,8 +303,9 @@ static struct comp_dev *dai_new(const struct comp_driver *drv,
dd->dma = dma_get(dir, dd->dai->dma_caps, dd->dai->dma_dev, DMA_ACCESS_SHARED);
if (!dd->dma) {
comp_cl_err(&comp_dai, "dai_new(): dma_get() failed to get shared access to DMA.");
goto error;
dai_put(dd->dai);
comp_err(dev, "dai_new(): dma_get() failed to get shared access to DMA.");
return -ENODEV;
}
k_spinlock_init(&dd->dai->lock);
@ -332,11 +314,43 @@ static struct comp_dev *dai_new(const struct comp_driver *drv,
dd->xrun = 0;
dd->chan = NULL;
return 0;
}
static struct comp_dev *dai_new(const struct comp_driver *drv,
const struct comp_ipc_config *config,
const void *spec)
{
struct comp_dev *dev;
const struct ipc_config_dai *dai_cfg = spec;
struct dai_data *dd;
int ret;
comp_cl_dbg(&comp_dai, "dai_new()");
dev = comp_alloc(drv, sizeof(*dev));
if (!dev)
return NULL;
dev->ipc_config = *config;
dd = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM, sizeof(*dd));
if (!dd)
goto e_data;
comp_set_drvdata(dev, dd);
ret = dai_zephyr_new(dd, dev, dai_cfg);
if (ret < 0)
goto error;
dev->state = COMP_STATE_READY;
return dev;
error:
rfree(dd);
e_data:
rfree(dev);
return NULL;
}