Skip to content

driver: adc: Use logging API #81124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kartben merged 1 commit into from
Dec 16, 2024
Merged

driver: adc: Use logging API #81124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 16 additions & 13 deletions drivers/adc/adc_ene_kb1200.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@
#include <zephyr/drivers/pinctrl.h>
#include <errno.h>
#include <reg/adc.h>
#include <zephyr/logging/log.h>

#define ADC_CONTEXT_USES_KERNEL_TIMER
#include "adc_context.h"

LOG_MODULE_REGISTER(adc_ene_kb1200, CONFIG_ADC_LOG_LEVEL);

struct adc_kb1200_config {
/* ADC Register base address */
struct adc_regs *adc;
Expand Down Expand Up @@ -70,17 +73,17 @@ static int adc_kb1200_start_read(const struct device *dev, const struct adc_sequ
int error = 0;

if (!sequence->channels || (sequence->channels & ~BIT_MASK(ADC_MAX_CHAN))) {
printk("Invalid ADC channels.\n");
LOG_ERR("Invalid ADC channels.");
return -EINVAL;
}
/* Fixed 10 bit resolution of ene ADC */
if (sequence->resolution != ADC_RESOLUTION) {
printk("Unfixed 10 bit ADC resolution.\n");
LOG_ERR("Unfixed 10 bit ADC resolution.");
return -ENOTSUP;
}
/* Check sequence->buffer_size is enough */
if (!adc_kb1200_validate_buffer_size(sequence)) {
printk("ADC buffer size too small.\n");
LOG_ERR("ADC buffer size too small.");
return -ENOMEM;
}

Expand All @@ -107,7 +110,7 @@ static int adc_kb1200_start_read(const struct device *dev, const struct adc_sequ
k_busy_wait(ADC_WAIT_TIME);
count++;
if (count >= ADC_WAIT_CNT) {
printk("ADC busy timeout...\n");
LOG_ERR("ADC busy timeout...");
error = -EBUSY;
break;
}
Expand Down Expand Up @@ -136,30 +139,30 @@ static int adc_kb1200_channel_setup(const struct device *dev,
const struct adc_channel_cfg *channel_cfg)
{
if (channel_cfg->channel_id >= ADC_MAX_CHAN) {
printk("Invalid channel %d.\n", channel_cfg->channel_id);
LOG_ERR("Invalid channel %d.", channel_cfg->channel_id);
return -EINVAL;
}

if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
printk("Unsupported channel acquisition time.\n");
LOG_ERR("Unsupported channel acquisition time.");
return -ENOTSUP;
}

if (channel_cfg->differential) {
printk("Differential channels are not supported.\n");
LOG_ERR("Differential channels are not supported.");
return -ENOTSUP;
}

if (channel_cfg->gain != ADC_GAIN_1) {
printk("Unsupported channel gain %d.\n", channel_cfg->gain);
LOG_ERR("Unsupported channel gain %d.", channel_cfg->gain);
return -ENOTSUP;
}

if (channel_cfg->reference != ADC_REF_INTERNAL) {
printk("Unsupported channel reference.\n");
LOG_ERR("Unsupported channel reference.");
return -ENOTSUP;
}
printk("ADC channel %d configured.\n", channel_cfg->channel_id);
LOG_DBG("ADC channel %d configured.", channel_cfg->channel_id);
return 0;
}

Expand Down Expand Up @@ -199,7 +202,7 @@ static void adc_context_start_sampling(struct adc_context *ctx)

data->repeat_buffer = data->buffer;
config->adc->ADCCFG = (config->adc->ADCCFG & ~ADC_CHANNEL_BIT_MASK) |
(ctx->sequence.channels << ADC_CHANNEL_BIT_POS);
(ctx->sequence.channels << ADC_CHANNEL_BIT_POS);
config->adc->ADCCFG |= ADC_FUNCTION_ENABLE;
}

Expand Down Expand Up @@ -231,7 +234,7 @@ static int adc_kb1200_init(const struct device *dev)
/* Configure pin-mux for ADC device */
ret = pinctrl_apply_state(config->pcfg, PINCTRL_STATE_DEFAULT);
if (ret < 0) {
printk("ADC pinctrl setup failed (%d).\n", ret);
LOG_ERR("ADC pinctrl setup failed (%d).", ret);
return ret;
}

Expand All @@ -249,7 +252,7 @@ static int adc_kb1200_init(const struct device *dev)
.adc = (struct adc_regs *)DT_INST_REG_ADDR(inst), \
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst), \
}; \
DEVICE_DT_INST_DEFINE(inst, &adc_kb1200_init, NULL, &adc_kb1200_data_##inst, \
DEVICE_DT_INST_DEFINE(inst, adc_kb1200_init, NULL, &adc_kb1200_data_##inst, \
&adc_kb1200_config_##inst, PRE_KERNEL_1, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &adc_kb1200_api);

Expand Down
Loading