michaelh/zephyr
1
0
Fork 0
Code Releases Activity

i2s: i2s_cavs: fix dma_tx_callback function signature

Browse source 
The dma_tx_callback() function signature is different than the one
required by struct dma_config. So change the signature to fix
a compiler warning.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2018-10-30 10:30:45 -07:00 • committed by Anas Nashif
commit d70eb98537
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/i2s/i2s_cavs.c
View file

@ -107,7 +107,7 @@ struct i2s_cavs_dev_data {
((struct i2s_cavs_dev_data *const)(dev)->driver_data) ((struct i2s_cavs_dev_data *const)(dev)->driver_data)
static struct device *get_dev_from_dma_channel(u32_t dma_channel); static struct device *get_dev_from_dma_channel(u32_t dma_channel);
static void dma_tx_callback(struct device *, u32_t, int); static void dma_tx_callback(void *, u32_t, int);
static void tx_stream_disable(struct stream *, static void tx_stream_disable(struct stream *,
volatile struct i2s_cavs_ssp *const, struct device *); volatile struct i2s_cavs_ssp *const, struct device *);
@ -224,7 +224,7 @@ static int start_dma(struct device *dev_dma, u32_t channel,
} }
/* This function is executed in the interrupt context */ /* This function is executed in the interrupt context */
static void dma_tx_callback(struct device *dev_dma, u32_t channel, int status) static void dma_tx_callback(void *dev_dma, u32_t channel, int status)
{ {
struct device *dev = get_dev_from_dma_channel(channel); struct device *dev = get_dev_from_dma_channel(channel);
const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev); const struct i2s_cavs_config *const dev_cfg = DEV_CFG(dev);
@ -236,6 +236,8 @@ static void dma_tx_callback(struct device *dev_dma, u32_t channel, int status)
__ASSERT_NO_MSG(strm->mem_block != NULL); __ASSERT_NO_MSG(strm->mem_block != NULL);
ARG_UNUSED(dev_dma);
if ((strm->cfg.options & I2S_OPT_PINGPONG) != I2S_OPT_PINGPONG) { if ((strm->cfg.options & I2S_OPT_PINGPONG) != I2S_OPT_PINGPONG) {
/* All block data sent */ /* All block data sent */
k_mem_slab_free(strm->cfg.mem_slab, &strm->mem_block); k_mem_slab_free(strm->cfg.mem_slab, &strm->mem_block);