michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: adc: tla2021: seperate thread, only when needed

Browse source 
only use the separate thread, when
CONFIG_ADC_ASYNC is enabled.

Signed-off-by: Fin Maaß <f.maass@vogl-electronic.com>
This commit is contained in:
Fin Maaß 2024-07-24 11:52:56 +02:00 • committed by Carles Cufí
commit 4a6dacf01b
2 changed files with 56 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/adc/Kconfig.tla2021
View file

@ -18,6 +18,8 @@ config ADC_TLA2021_INIT_PRIORITY
Fine tune the priority for the driver initialization. Make sure it's
higher (-> lower priority) than I2C_INIT_PRIORITY.
if ADC_ASYNC
config ADC_TLA2021_ACQUISITION_THREAD_PRIORITY
int "Priority for the data acquisition thread"
default 0
@ -31,4 +33,6 @@ config ADC_TLA2021_ACQUISITION_THREAD_STACK_SIZE
Stack size for the internal data acquisition thread. Requires room
for I2C operations.
endif # ADC_ASYNC
endif # ADC_TLA2021

90
drivers/adc/adc_tla2021.c
View file

@ -53,13 +53,14 @@ typedef uint16_t tla2021_reg_config_t;
struct tla2021_config {
const struct i2c_dt_spec bus;
k_tid_t acq_thread_id;
};
struct tla2021_data {
const struct device *dev;
struct adc_context ctx;
#ifdef CONFIG_ADC_ASYNC
struct k_sem acq_lock;
#endif
tla2021_reg_data_t *buffer;
tla2021_reg_data_t *repeat_buffer;
@ -186,6 +187,40 @@ static int tla2021_read(const struct device *dev, const struct adc_sequence *seq
return tla2021_read_async(dev, seq, NULL);
}
static void tla2021_perform_read(const struct device *dev)
{
struct tla2021_data *data = dev->data;
tla2021_reg_config_t reg;
tla2021_reg_data_t res;
int ret;
/*
* Wait until sampling is done
*/
do {
ret = tla2021_read_register(dev, REG_CONFIG, &reg);
if (ret < 0) {
adc_context_complete(&data->ctx, ret);
}
} while (!(reg & REG_CONFIG_OS_msk));
/*
* Read result
*/
ret = tla2021_read_register(dev, REG_DATA, &res);
if (ret) {
adc_context_complete(&data->ctx, ret);
}
/*
* ADC data is stored in the upper 12 bits
*/
res >>= REG_DATA_pos;
*data->buffer++ = res;
adc_context_on_sampling_done(&data->ctx, data->dev);
}
static void adc_context_start_sampling(struct adc_context *ctx)
{
int ret;
@ -207,7 +242,11 @@ static void adc_context_start_sampling(struct adc_context *ctx)
data->repeat_buffer = data->buffer;
#ifdef CONFIG_ADC_ASYNC
k_sem_give(&data->acq_lock);
#else
tla2021_perform_read(dev);
#endif
}
static void adc_context_update_buffer_pointer(struct adc_context *ctx, bool repeat_sampling)
@ -219,46 +258,19 @@ static void adc_context_update_buffer_pointer(struct adc_context *ctx, bool repe
}
}
#ifdef CONFIG_ADC_ASYNC
static void tla2021_acq_thread_fn(void *p1, void *p2, void *p3)
{
int ret;
struct tla2021_data *data = p1;
const struct device *dev = data->dev;
const struct device *dev = p1;
struct tla2021_data *data = dev->data;
while (true) {
k_sem_take(&data->acq_lock, K_FOREVER);
tla2021_reg_config_t reg;
tla2021_reg_data_t res;
/*
* Wait until sampling is done
*/
do {
ret = tla2021_read_register(dev, REG_CONFIG, &reg);
if (ret < 0) {
adc_context_complete(&data->ctx, ret);
}
} while (!(reg & REG_CONFIG_OS_msk));
/*
* Read result
*/
ret = tla2021_read_register(dev, REG_DATA, &res);
if (ret) {
adc_context_complete(&data->ctx, ret);
}
/*
* ADC data is stored in the upper 12 bits
*/
res >>= REG_DATA_pos;
*data->buffer++ = res;
adc_context_on_sampling_done(&data->ctx, data->dev);
tla2021_perform_read(dev);
}
}
#endif
static int tla2021_init(const struct device *dev)
{
@ -267,8 +279,6 @@ static int tla2021_init(const struct device *dev)
const struct tla2021_config *config = dev->config;
struct tla2021_data *data = dev->data;
k_sem_init(&data->acq_lock, 0, 1);
if (!i2c_is_ready_dt(&config->bus)) {
LOG_ERR("Bus not ready");
return -EINVAL;
@ -294,14 +304,16 @@ static const struct adc_driver_api tla2021_driver_api = {
#endif
};
#define TLA2021_THREAD_INIT(n) \
K_THREAD_DEFINE(adc_tla2021_##n##_thread, ACQ_THREAD_STACK_SIZE, tla2021_acq_thread_fn, \
DEVICE_DT_INST_GET(n), NULL, NULL, ACQ_THREAD_PRIORITY, 0, 0);
#define TLA2021_INIT(n) \
static const struct tla2021_config inst_##n##_config; \
static struct tla2021_data inst_##n##_data; \
K_THREAD_DEFINE(inst_##n##_thread, ACQ_THREAD_STACK_SIZE, tla2021_acq_thread_fn, \
&inst_##n##_data, NULL, NULL, ACQ_THREAD_PRIORITY, 0, 0); \
IF_ENABLED(CONFIG_ADC_ASYNC, (TLA2021_THREAD_INIT(n))) \
static const struct tla2021_config inst_##n##_config = { \
.bus = I2C_DT_SPEC_INST_GET(n), \
.acq_thread_id = inst_##n##_thread, \
}; \
static struct tla2021_data inst_##n##_data = { \
.dev = DEVICE_DT_INST_GET(n), \
@ -309,6 +321,8 @@ static const struct adc_driver_api tla2021_driver_api = {
ADC_CONTEXT_INIT_TIMER(inst_##n##_data, ctx), \
ADC_CONTEXT_INIT_SYNC(inst_##n##_data, ctx), \
.reg_config = REG_CONFIG_DEFAULT, \
IF_ENABLED(CONFIG_ADC_ASYNC, \
(.acq_lock = Z_SEM_INITIALIZER(inst_##n##_data.acq_lock, 0, 1),)) \
}; \
DEVICE_DT_INST_DEFINE(n, &tla2021_init, NULL, &inst_##n##_data, &inst_##n##_config, \
POST_KERNEL, CONFIG_ADC_TLA2021_INIT_PRIORITY, &tla2021_driver_api);