michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: Modify subcommands to use SHELL_STATIC_SUBCMD_SET_CREATE

Browse source 
It is planned to deprecate SHELL_CREATE_STATIC_SUBCMD_SET macro
which is replaced by SHELL_STATIC_SUBCMD_SET_CREATE.

Additionally, removed irrelevant comments about alphabetical
ordering which is no longer needed.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2019-02-13 14:53:29 +01:00 • committed by Anas Nashif
commit 3605e48c44
29 changed files with 106 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/shell/modules/device_service.c
View file

@ -95,12 +95,10 @@ static int cmd_device_list(const struct shell *shell,
}
SHELL_CREATE_STATIC_SUBCMD_SET(sub_device)
{
/* Alphabetically sorted. */
SHELL_STATIC_SUBCMD_SET_CREATE(sub_device,
SHELL_CMD(levels, NULL, "List configured devices by levels", cmd_device_levels),
SHELL_CMD(list, NULL, "List configured devices", cmd_device_list),
SHELL_SUBCMD_SET_END /* Array terminated. */
};
);
SHELL_CMD_REGISTER(device, &sub_device, "Device commands", NULL);

12
subsys/shell/modules/kernel_service.c
View file

@ -142,18 +142,14 @@ static int cmd_kernel_reboot_cold(const struct shell *shell,
return 0;
}
SHELL_CREATE_STATIC_SUBCMD_SET(sub_kernel_reboot)
{
/* Alphabetically sorted. */
SHELL_STATIC_SUBCMD_SET_CREATE(sub_kernel_reboot,
SHELL_CMD(cold, NULL, "Cold reboot.", cmd_kernel_reboot_cold),
SHELL_CMD(warm, NULL, "Warm reboot.", cmd_kernel_reboot_warm),
SHELL_SUBCMD_SET_END /* Array terminated. */
};
);
#endif
SHELL_CREATE_STATIC_SUBCMD_SET(sub_kernel)
{
/* Alphabetically sorted. */
SHELL_STATIC_SUBCMD_SET_CREATE(sub_kernel,
SHELL_CMD(cycles, NULL, "Kernel cycles.", cmd_kernel_cycles),
#if defined(CONFIG_REBOOT)
SHELL_CMD(reboot, &sub_kernel_reboot, "Reboot.", NULL),
@ -166,6 +162,6 @@ SHELL_CREATE_STATIC_SUBCMD_SET(sub_kernel)
SHELL_CMD(uptime, NULL, "Kernel uptime.", cmd_kernel_uptime),
SHELL_CMD(version, NULL, "Kernel version.", cmd_kernel_version),
SHELL_SUBCMD_SET_END /* Array terminated. */
};
);
SHELL_CMD_REGISTER(kernel, &sub_kernel, "Kernel commands", NULL);

30
subsys/shell/shell_cmds.c
View file

@ -394,54 +394,48 @@ static int cmd_resize(const struct shell *shell, size_t argc, char **argv)
return 0;
}
SHELL_CREATE_STATIC_SUBCMD_SET(m_sub_colors)
{
SHELL_STATIC_SUBCMD_SET_CREATE(m_sub_colors,
SHELL_CMD_ARG(off, NULL, SHELL_HELP_COLORS_OFF, cmd_colors_off, 1, 0),
SHELL_CMD_ARG(on, NULL, SHELL_HELP_COLORS_ON, cmd_colors_on, 1, 0),
SHELL_SUBCMD_SET_END
};
);
SHELL_CREATE_STATIC_SUBCMD_SET(m_sub_echo)
{
SHELL_STATIC_SUBCMD_SET_CREATE(m_sub_echo,
SHELL_CMD_ARG(off, NULL, SHELL_HELP_ECHO_OFF, cmd_echo_off, 1, 0),
SHELL_CMD_ARG(on, NULL, SHELL_HELP_ECHO_ON, cmd_echo_on, 1, 0),
SHELL_SUBCMD_SET_END
};
);
SHELL_CREATE_STATIC_SUBCMD_SET(m_sub_shell_stats)
{
SHELL_STATIC_SUBCMD_SET_CREATE(m_sub_shell_stats,
SHELL_CMD_ARG(reset, NULL, SHELL_HELP_STATISTICS_RESET,
cmd_shell_stats_reset, 1, 0),
SHELL_CMD_ARG(show, NULL, SHELL_HELP_STATISTICS_SHOW,
cmd_shell_stats_show, 1, 0),
SHELL_SUBCMD_SET_END
};
);
SHELL_CREATE_STATIC_SUBCMD_SET(m_sub_backspace_mode)
{
SHELL_STATIC_SUBCMD_SET_CREATE(m_sub_backspace_mode,
SHELL_CMD_ARG(backspace, NULL, SHELL_HELP_BACKSPACE_MODE_BACKSPACE,
cmd_bacskpace_mode_backspace, 1, 0),
SHELL_CMD_ARG(delete, NULL, SHELL_HELP_BACKSPACE_MODE_DELETE,
cmd_bacskpace_mode_delete, 1, 0),
SHELL_SUBCMD_SET_END
};
);
SHELL_CREATE_STATIC_SUBCMD_SET(m_sub_shell)
{
SHELL_STATIC_SUBCMD_SET_CREATE(m_sub_shell,
SHELL_CMD(backspace_mode, &m_sub_backspace_mode,
SHELL_HELP_BACKSPACE_MODE, NULL),
SHELL_CMD(colors, &m_sub_colors, SHELL_HELP_COLORS, NULL),
SHELL_CMD_ARG(echo, &m_sub_echo, SHELL_HELP_ECHO, cmd_echo, 1, 1),
SHELL_CMD(stats, &m_sub_shell_stats, SHELL_HELP_STATISTICS, NULL),
SHELL_SUBCMD_SET_END
};
);
SHELL_CREATE_STATIC_SUBCMD_SET(m_sub_resize)
{
SHELL_STATIC_SUBCMD_SET_CREATE(m_sub_resize,
SHELL_CMD_ARG(default, NULL, SHELL_HELP_RESIZE_DEFAULT,
cmd_resize_default, 1, 0),
SHELL_SUBCMD_SET_END
};
);
SHELL_CMD_ARG_REGISTER(clear, NULL, SHELL_HELP_CLEAR, cmd_clear, 1, 0);
SHELL_CMD_REGISTER(shell, &m_sub_shell, SHELL_HELP_SHELL, NULL);