Skip to content

can: shell: support device node labels #82220

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

Closed
wants to merge 1 commit into from
Closed

can: shell: support device node labels #82220

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions drivers/can/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ config CAN_DEFAULT_BITRATE_DATA
config CAN_SHELL
bool "CAN shell"
depends on SHELL
imply DEVICE_DT_METADATA
select POLL
help
Enable CAN Shell for testing.
Expand Down
42 changes: 30 additions & 12 deletions drivers/can/can_shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,27 @@ static void can_shell_print_extended_modes(const struct shell *sh, can_mode_t ca
}
}

static const struct device *get_can_controller(char *id)
{
const struct device *dev = device_get_binding(id);

if (dev != NULL) {
return dev;
}

#ifdef CONFIG_DEVICE_DT_METADATA
dev = device_get_by_dt_nodelabel(id);
if (dev != NULL) {
return dev;
}
#endif /* CONFIG_DEVICE_DT_METADATA */

return NULL;
}

static int cmd_can_start(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
int err;

if (!device_is_ready(dev)) {
Expand All @@ -297,7 +315,7 @@ static int cmd_can_start(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_stop(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
int err;

if (!device_is_ready(dev)) {
Expand All @@ -318,7 +336,7 @@ static int cmd_can_stop(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_show(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
const struct device *phy;
const struct can_timing *timing_min;
const struct can_timing *timing_max;
Expand Down Expand Up @@ -429,7 +447,7 @@ static int cmd_can_show(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_bitrate_set(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
struct can_timing timing = { 0 };
uint16_t sample_pnt;
uint32_t bitrate;
Expand Down Expand Up @@ -500,7 +518,7 @@ static int cmd_can_bitrate_set(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_dbitrate_set(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
struct can_timing timing = { 0 };
uint16_t sample_pnt;
uint32_t bitrate;
Expand Down Expand Up @@ -609,7 +627,7 @@ static int can_shell_parse_timing(const struct shell *sh, size_t argc, char **ar

static int cmd_can_timing_set(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
struct can_timing timing = { 0 };
int err;

Expand Down Expand Up @@ -638,7 +656,7 @@ static int cmd_can_timing_set(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_dtiming_set(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
struct can_timing timing = { 0 };
int err;

Expand Down Expand Up @@ -667,7 +685,7 @@ static int cmd_can_dtiming_set(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_mode_set(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
can_mode_t mode = CAN_MODE_NORMAL;
can_mode_t raw;
char *endptr;
Expand Down Expand Up @@ -715,7 +733,7 @@ static int cmd_can_mode_set(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_send(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
static unsigned int frame_counter;
unsigned int frame_no;
struct can_frame frame = { 0 };
Expand Down Expand Up @@ -836,7 +854,7 @@ static int cmd_can_send(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_filter_add(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
struct can_filter filter;
uint32_t id_mask;
int argidx = 2;
Expand Down Expand Up @@ -936,7 +954,7 @@ static int cmd_can_filter_add(const struct shell *sh, size_t argc, char **argv)

static int cmd_can_filter_remove(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
int filter_id;
char *endptr;

Expand All @@ -960,7 +978,7 @@ static int cmd_can_filter_remove(const struct shell *sh, size_t argc, char **arg

static int cmd_can_recover(const struct shell *sh, size_t argc, char **argv)
{
const struct device *dev = device_get_binding(argv[1]);
const struct device *dev = get_can_controller(argv[1]);
k_timeout_t timeout = K_FOREVER;
int millisec;
char *endptr;
Expand Down
Loading