Skip to content
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.

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

shell: Remove shell workaround #127

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
14 changes: 0 additions & 14 deletions drivers/npmx/shell/shell_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,6 @@
#include <npmx_charger.h>
#include <zephyr/shell/shell.h>

/* Due to the bug in zephyr/shell/shell.h, it is required to override macro implementation. */
/* It should be removed after the next Zephyr release with the fix. */
/* https://github.com/zephyrproject-rtos/zephyr/pull/64455 */
#undef SHELL_SUBCMD_ADD

// clang-format off
#define SHELL_SUBCMD_ADD(_parent, _syntax, _subcmd, _help, _handler, _mand, _opt) \
static const struct shell_static_entry Z_SHELL_SUBCMD_NAME(__DEBRACKET _parent, _syntax) \
__attribute__((section("." STRINGIFY(Z_SHELL_SUBCMD_NAME( \
NUM_VA_ARGS_LESS_1 _parent, __DEBRACKET _parent, _syntax))))) \
__attribute__((used)) = \
SHELL_EXPR_CMD_ARG(1, _syntax, _subcmd, _help, _handler, _mand, _opt)
// clang-format on

/** @brief Max supported number of shell arguments. */
#define SHELL_ARG_MAX_COUNT 3U

Expand Down