8c748fd005
Modify the signature of the k_mem_slab_free() function with a new one, replacing the old void **mem with void *mem as a parameter. The following function: void k_mem_slab_free(struct k_mem_slab *slab, void **mem); has the wrong signature. mem is only used as a regular pointer, so there is no need to use a double-pointer. The correct signature should be: void k_mem_slab_free(struct k_mem_slab *slab, void *mem); The issue with the current signature, although functional, is that it is extremely confusing. I myself, a veteran Zephyr developer, was confused by this parameter when looking at it recently. All in-tree uses of the function have been adapted. Fixes #61888. Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
59 lines
1.1 KiB
C
59 lines
1.1 KiB
C
/*
|
|
* Copyright (c) 2018 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/kernel.h>
|
|
#include <string.h>
|
|
#include <zephyr/drivers/i2s.h>
|
|
|
|
int z_impl_i2s_buf_read(const struct device *dev, void *buf, size_t *size)
|
|
{
|
|
void *mem_block;
|
|
int ret;
|
|
|
|
ret = i2s_read((const struct device *)dev, &mem_block, size);
|
|
|
|
if (!ret) {
|
|
const struct i2s_config *rx_cfg;
|
|
|
|
rx_cfg = i2s_config_get((const struct device *)dev, I2S_DIR_RX);
|
|
|
|
memcpy(buf, mem_block, *size);
|
|
k_mem_slab_free(rx_cfg->mem_slab, mem_block);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
int z_impl_i2s_buf_write(const struct device *dev, void *buf, size_t size)
|
|
{
|
|
int ret;
|
|
const struct i2s_config *tx_cfg;
|
|
void *mem_block;
|
|
|
|
tx_cfg = i2s_config_get((const struct device *)dev, I2S_DIR_TX);
|
|
if (!tx_cfg) {
|
|
return -EIO;
|
|
}
|
|
|
|
if (size > tx_cfg->block_size) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
ret = k_mem_slab_alloc(tx_cfg->mem_slab, &mem_block, K_FOREVER);
|
|
if (ret < 0) {
|
|
return -ENOMEM;
|
|
}
|
|
|
|
memcpy(mem_block, (void *)buf, size);
|
|
|
|
ret = i2s_write((const struct device *)dev, mem_block, size);
|
|
if (ret != 0) {
|
|
k_mem_slab_free(tx_cfg->mem_slab, mem_block);
|
|
}
|
|
|
|
return ret;
|
|
}
|