michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: adc: shell: use DEVICE_DT_GET

Browse source 
ADC instances can be obtained at compile time, so use DEVICE_DT_GET.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-03-15 20:00:06 +01:00 • committed by Carles Cufí
commit 87b982d878
1 changed files with 32 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

80
drivers/adc/adc_shell.c
View file

@ -79,10 +79,10 @@ LOG_MODULE_REGISTER(adc_shell);
#define CMD_HELP_GAIN "Configure gain.\n" #define CMD_HELP_GAIN "Configure gain.\n"
#define CMD_HELP_PRINT "Print current configuration" #define CMD_HELP_PRINT "Print current configuration"
#define NODE_LABELS(n) DT_INST_LABEL(n), #define DEVICES(n) DEVICE_DT_INST_GET(n),
#define ADC_HDL_LIST_ENTRY(label) \ #define ADC_HDL_LIST_ENTRY(dev_) \
{ \ { \
.device_label = label, \ .dev = dev_, \
.channel_config = { \ .channel_config = { \
.gain = ADC_GAIN_1, \ .gain = ADC_GAIN_1, \
.reference = ADC_REF_INTERNAL, \ .reference = ADC_REF_INTERNAL, \
@ -92,7 +92,7 @@ LOG_MODULE_REGISTER(adc_shell);
.resolution = 0, \ .resolution = 0, \
} }
#define INIT_MACRO() DT_INST_FOREACH_STATUS_OKAY(NODE_LABELS) "NA" #define INIT_MACRO() DT_INST_FOREACH_STATUS_OKAY(DEVICES) NULL
#define CHOSEN_STR_LEN 20 #define CHOSEN_STR_LEN 20
static char chosen_reference[CHOSEN_STR_LEN + 1] = "INTERNAL"; static char chosen_reference[CHOSEN_STR_LEN + 1] = "INTERNAL";
@ -100,7 +100,7 @@ static char chosen_gain[CHOSEN_STR_LEN + 1] = "1";
/* This table size is = ADC devices count + 1 (NA). */ /* This table size is = ADC devices count + 1 (NA). */
static struct adc_hdl { static struct adc_hdl {
char *device_label; const struct device *dev;
struct adc_channel_cfg channel_config; struct adc_channel_cfg channel_config;
uint8_t resolution; uint8_t resolution;
} adc_list[] = { } adc_list[] = {
@ -110,7 +110,7 @@ static struct adc_hdl {
static struct adc_hdl *get_adc(const char *device_label) static struct adc_hdl *get_adc(const char *device_label)
{ {
for (int i = 0; i < ARRAY_SIZE(adc_list); i++) { for (int i = 0; i < ARRAY_SIZE(adc_list); i++) {
if (!strcmp(device_label, adc_list[i].device_label)) { if (!strcmp(device_label, adc_list[i].dev->name)) {
return &adc_list[i]; return &adc_list[i];
} }
} }
@ -124,12 +124,10 @@ static int cmd_adc_ch_id(const struct shell *shell, size_t argc, char **argv)
{ {
/* -2: index of ADC label name */ /* -2: index of ADC label name */
struct adc_hdl *adc = get_adc(argv[-2]); struct adc_hdl *adc = get_adc(argv[-2]);
const struct device *adc_dev;
int retval = 0; int retval = 0;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "ADC device not found");
return -ENODEV; return -ENODEV;
} }
@ -139,7 +137,7 @@ static int cmd_adc_ch_id(const struct shell *shell, size_t argc, char **argv)
} }
adc->channel_config.channel_id = (uint8_t)strtol(argv[1], NULL, 10); adc->channel_config.channel_id = (uint8_t)strtol(argv[1], NULL, 10);
retval = adc_channel_setup(adc_dev, &adc->channel_config); retval = adc_channel_setup(adc->dev, &adc->channel_config);
LOG_DBG("Channel setup returned %i\n", retval); LOG_DBG("Channel setup returned %i\n", retval);
return retval; return retval;
@ -150,12 +148,10 @@ static int cmd_adc_ch_neg(const struct shell *shell, size_t argc, char **argv)
#if CONFIG_ADC_CONFIGURABLE_INPUTS #if CONFIG_ADC_CONFIGURABLE_INPUTS
/* -2: index of ADC label name */ /* -2: index of ADC label name */
struct adc_hdl *adc = get_adc(argv[-2]); struct adc_hdl *adc = get_adc(argv[-2]);
const struct device *adc_dev;
int retval = 0; int retval = 0;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "ADC device not found");
return -ENODEV; return -ENODEV;
} }
@ -165,7 +161,7 @@ static int cmd_adc_ch_neg(const struct shell *shell, size_t argc, char **argv)
} }
adc->channel_config.input_negative = (uint8_t)strtol(argv[1], NULL, 10); adc->channel_config.input_negative = (uint8_t)strtol(argv[1], NULL, 10);
retval = adc_channel_setup(adc_dev, &adc->channel_config); retval = adc_channel_setup(adc->dev, &adc->channel_config);
LOG_DBG("Channel setup returned %i\n", retval); LOG_DBG("Channel setup returned %i\n", retval);
return retval; return retval;
@ -179,12 +175,10 @@ static int cmd_adc_ch_pos(const struct shell *shell, size_t argc, char **argv)
#if CONFIG_ADC_CONFIGURABLE_INPUTS #if CONFIG_ADC_CONFIGURABLE_INPUTS
/* -2: index of ADC label name */ /* -2: index of ADC label name */
struct adc_hdl *adc = get_adc(argv[-2]); struct adc_hdl *adc = get_adc(argv[-2]);
const struct device *adc_dev;
int retval = 0; int retval = 0;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "ADC device not found");
return -ENODEV; return -ENODEV;
} }
@ -194,7 +188,7 @@ static int cmd_adc_ch_pos(const struct shell *shell, size_t argc, char **argv)
} }
adc->channel_config.input_positive = (uint8_t)strtol(argv[1], NULL, 10); adc->channel_config.input_positive = (uint8_t)strtol(argv[1], NULL, 10);
retval = adc_channel_setup(adc_dev, &adc->channel_config); retval = adc_channel_setup(adc->dev, &adc->channel_config);
LOG_DBG("Channel setup returned %i\n", retval); LOG_DBG("Channel setup returned %i\n", retval);
return retval; return retval;
@ -209,12 +203,10 @@ static int cmd_adc_gain(const struct shell *shell, size_t argc, char **argv,
/* -2: index of ADC label name */ /* -2: index of ADC label name */
struct adc_hdl *adc = get_adc(argv[-2]); struct adc_hdl *adc = get_adc(argv[-2]);
enum adc_gain gain = (enum adc_gain)data; enum adc_gain gain = (enum adc_gain)data;
const struct device *adc_dev;
int retval = -EINVAL; int retval = -EINVAL;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "ADC device not found");
return -ENODEV; return -ENODEV;
} }
@ -223,7 +215,7 @@ static int cmd_adc_gain(const struct shell *shell, size_t argc, char **argv,
: strlen(argv[0]); : strlen(argv[0]);
memcpy(chosen_gain, argv[0], len); memcpy(chosen_gain, argv[0], len);
chosen_gain[len] = '\0'; chosen_gain[len] = '\0';
retval = adc_channel_setup(adc_dev, &adc->channel_config); retval = adc_channel_setup(adc->dev, &adc->channel_config);
LOG_DBG("Channel setup returned %i\n", retval); LOG_DBG("Channel setup returned %i\n", retval);
return retval; return retval;
@ -233,13 +225,11 @@ static int cmd_adc_acq(const struct shell *shell, size_t argc, char **argv)
{ {
/* -1 index of ADC label name */ /* -1 index of ADC label name */
struct adc_hdl *adc = get_adc(argv[-1]); struct adc_hdl *adc = get_adc(argv[-1]);
const struct device *adc_dev;
uint16_t acq_time; uint16_t acq_time;
int retval; int retval;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "ADC device not found");
return -ENODEV; return -ENODEV;
} }
@ -262,7 +252,7 @@ static int cmd_adc_acq(const struct shell *shell, size_t argc, char **argv)
adc->channel_config.acquisition_time = adc->channel_config.acquisition_time =
ADC_ACQ_TIME_DEFAULT; ADC_ACQ_TIME_DEFAULT;
} }
retval = adc_channel_setup(adc_dev, &adc->channel_config); retval = adc_channel_setup(adc->dev, &adc->channel_config);
LOG_DBG("Channel setup returned %i\n", retval); LOG_DBG("Channel setup returned %i\n", retval);
return retval; return retval;
@ -271,12 +261,10 @@ static int cmd_adc_reso(const struct shell *shell, size_t argc, char **argv)
{ {
/* -1 index of ADC label name */ /* -1 index of ADC label name */
struct adc_hdl *adc = get_adc(argv[-1]); struct adc_hdl *adc = get_adc(argv[-1]);
const struct device *adc_dev;
int retval; int retval;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "ADC device not found");
return -ENODEV; return -ENODEV;
} }
@ -286,7 +274,7 @@ static int cmd_adc_reso(const struct shell *shell, size_t argc, char **argv)
} }
adc->resolution = (uint8_t)strtol(argv[1], NULL, 10); adc->resolution = (uint8_t)strtol(argv[1], NULL, 10);
retval = adc_channel_setup(adc_dev, &adc->channel_config); retval = adc_channel_setup(adc->dev, &adc->channel_config);
return retval; return retval;
} }
@ -297,12 +285,10 @@ static int cmd_adc_ref(const struct shell *shell, size_t argc, char **argv,
/* -2 index of ADC label name */ /* -2 index of ADC label name */
struct adc_hdl *adc = get_adc(argv[-2]); struct adc_hdl *adc = get_adc(argv[-2]);
enum adc_reference reference = (enum adc_reference)data; enum adc_reference reference = (enum adc_reference)data;
const struct device *adc_dev;
int retval = -EINVAL; int retval = -EINVAL;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "ADC device not found");
return -ENODEV; return -ENODEV;
} }
@ -312,7 +298,7 @@ static int cmd_adc_ref(const struct shell *shell, size_t argc, char **argv,
chosen_reference[len] = '\0'; chosen_reference[len] = '\0';
adc->channel_config.reference = reference; adc->channel_config.reference = reference;
retval = adc_channel_setup(adc_dev, &adc->channel_config); retval = adc_channel_setup(adc->dev, &adc->channel_config);
LOG_DBG("Channel setup returned %i\n", retval); LOG_DBG("Channel setup returned %i\n", retval);
return retval; return retval;
@ -325,12 +311,10 @@ static int cmd_adc_read(const struct shell *shell, size_t argc, char **argv)
/* -1 index of adc label name */ /* -1 index of adc label name */
struct adc_hdl *adc = get_adc(argv[-1]); struct adc_hdl *adc = get_adc(argv[-1]);
uint16_t m_sample_buffer[BUFFER_SIZE]; uint16_t m_sample_buffer[BUFFER_SIZE];
const struct device *adc_dev;
int retval; int retval;
adc_dev = device_get_binding(adc->device_label); if (!device_is_ready(adc->dev)) {
if (adc_dev == NULL) { shell_error(shell, "ADC device not ready");
shell_error(shell, "adc device not found");
return -ENODEV; return -ENODEV;
} }
@ -342,7 +326,7 @@ static int cmd_adc_read(const struct shell *shell, size_t argc, char **argv)
.resolution = adc->resolution, .resolution = adc->resolution,
}; };
retval = adc_read(adc_dev, &sequence); retval = adc_read(adc->dev, &sequence);
if (retval >= 0) { if (retval >= 0) {
shell_print(shell, "read: %i", m_sample_buffer[0]); shell_print(shell, "read: %i", m_sample_buffer[0]);
} }
@ -361,7 +345,7 @@ static int cmd_adc_print(const struct shell *shell, size_t argc, char **argv)
"Acquisition Time: %u\n" "Acquisition Time: %u\n"
"Channel ID: %u\n" "Channel ID: %u\n"
"Resolution: %u", "Resolution: %u",
adc->device_label, adc->dev->name,
chosen_gain, chosen_gain,
chosen_reference, chosen_reference,
adc->channel_config.acquisition_time, adc->channel_config.acquisition_time,
@ -422,7 +406,7 @@ static void cmd_adc_dev_get(size_t idx, struct shell_static_entry *entry)
{ {
/* -1 because the last element in the list is a "list terminator" */ /* -1 because the last element in the list is a "list terminator" */
if (idx < ARRAY_SIZE(adc_list) - 1) { if (idx < ARRAY_SIZE(adc_list) - 1) {
entry->syntax = adc_list[idx].device_label; entry->syntax = adc_list[idx].dev->name;
entry->handler = NULL; entry->handler = NULL;
entry->subcmd = &sub_adc_cmds; entry->subcmd = &sub_adc_cmds;
entry->help = "Select subcommand for ADC property label.\n"; entry->help = "Select subcommand for ADC property label.\n";