diff --git a/doc/releases/release-notes-2.2.rst b/doc/releases/release-notes-2.2.rst index 4e09fc80e10..93a7907c906 100644 --- a/doc/releases/release-notes-2.2.rst +++ b/doc/releases/release-notes-2.2.rst @@ -52,6 +52,12 @@ Stable API changes in this release Removed APIs in this release ============================ +* Shell + + * SHELL_CREATE_STATIC_SUBCMD_SET (deprecated), replaced by + SHELL_STATIC_SUBCMD_SET_CREATE + * SHELL_CREATE_DYNAMIC_CMD (deprecated), replaced by SHELL_DYNAMIC_CMD_CREATE + Kernel ****** diff --git a/include/shell/shell.h b/include/shell/shell.h index 0e8172cccd8..1f0cac72771 100644 --- a/include/shell/shell.h +++ b/include/shell/shell.h @@ -223,23 +223,6 @@ struct shell_static_entry { .u = { .entry = shell_##name } \ } -/** - * @brief Deprecated macro for creating a subcommand set. - * - * It must be used outside of any function body. - * - * @param[in] name Name of the subcommand set. - */ -#define SHELL_CREATE_STATIC_SUBCMD_SET(name) \ - __DEPRECATED_MACRO \ - static const struct shell_static_entry shell_##name[]; \ - static const struct shell_cmd_entry name = { \ - .is_dynamic = false, \ - .u.entry = shell_##name \ - }; \ - static const struct shell_static_entry shell_##name[] = - - /** * @brief Define ending subcommands set. * @@ -258,15 +241,6 @@ struct shell_static_entry { .u = { .dynamic_get = get } \ } -/** - * @brief Deprecated macro for creating a dynamic entry. - * - * @param[in] name Name of the dynamic entry. - * @param[in] get Pointer to the function returning dynamic commands array - */ -#define SHELL_CREATE_DYNAMIC_CMD(name, get) \ - __DEPRECATED_MACRO SHELL_DYNAMIC_CMD_CREATE(name, get) - /** * @brief Initializes a shell command with arguments. *