You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2019/06/03 09:25:55 UTC
[mynewt-core] branch master updated: da1469x_charger: Fix build
after shell update
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new edee2c7 da1469x_charger: Fix build after shell update
edee2c7 is described below
commit edee2c7a2958452252b0958eb614ac7ffc25121e
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Mon Jun 3 11:04:58 2019 +0200
da1469x_charger: Fix build after shell update
No functional changes.
Shell structures were extended, charger code now uses up-to-date
macros for initialization of command arrays.
---
.../da1469x_charger/src/da1469x_charger_shell.c | 74 +++++++++++-----------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/hw/drivers/chg_ctrl/da1469x_charger/src/da1469x_charger_shell.c b/hw/drivers/chg_ctrl/da1469x_charger/src/da1469x_charger_shell.c
index 272770d..98f97f2 100644
--- a/hw/drivers/chg_ctrl/da1469x_charger/src/da1469x_charger_shell.c
+++ b/hw/drivers/chg_ctrl/da1469x_charger/src/da1469x_charger_shell.c
@@ -1144,46 +1144,46 @@ da1469x_charger_reg_cmd(int argc, char **argv)
static const struct shell_cmd da1469x_charger_cmds[] = {
#if MYNEWT_VAL(DA1469X_CHARGER_CLI_DECODE)
- { "decode", da1469x_charger_shell_cmd_decode, HELP(decode) },
+ SHELL_CMD("decode", da1469x_charger_shell_cmd_decode, HELP(decode)),
#endif
- { "dump", da1469x_charger_shell_cmd_dump, HELP(dump) },
- { "enable", da1469x_charger_shell_cmd_enable, HELP(enable) },
- { "disable", da1469x_charger_shell_cmd_disable, HELP(disable) },
- { "status", da1469x_charger_shell_cmd_status, HELP(status) },
- { "clrirq", da1469x_charger_shell_cmd_clear_irq, HELP(clear_irq) },
- { "seti", da1469x_charger_shell_cmd_set_i, HELP(set_i) },
- { "setv", da1469x_charger_shell_cmd_set_v, HELP(set_v) },
+ SHELL_CMD("dump", da1469x_charger_shell_cmd_dump, HELP(dump)),
+ SHELL_CMD("enable", da1469x_charger_shell_cmd_enable, HELP(enable)),
+ SHELL_CMD("disable", da1469x_charger_shell_cmd_disable, HELP(disable)),
+ SHELL_CMD("status", da1469x_charger_shell_cmd_status, HELP(status)),
+ SHELL_CMD("clrirq", da1469x_charger_shell_cmd_clear_irq, HELP(clear_irq)),
+ SHELL_CMD("seti", da1469x_charger_shell_cmd_set_i, HELP(set_i)),
+ SHELL_CMD("setv", da1469x_charger_shell_cmd_set_v, HELP(set_v)),
#if MYNEWT_VAL(DA1469X_CHARGER_USE_CHARGE_CONTROL)
- { "listen", da1469x_charger_shell_cmd_listen, HELP(listen) },
+ SHELL_CMD("listen", da1469x_charger_shell_cmd_listen, HELP(listen)),
#endif
- { REG_NAME(CTRL), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(STATUS), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(VOLTAGE_PARAM), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(CURRENT_PARAM), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(TEMPSET_PARAM), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(PRE_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(CC_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(CV_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(TOTAL_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(JEITA_V_CHARGE), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(JEITA_V_PRECHARGE), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(JEITA_V_REPLENISH), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(JEITA_V_OVP), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(JEITA_CURRENT), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(VBAT_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(VOVP_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(TDIE_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(TBAT_MON_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(TBAT_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(THOT_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(PWR_UP_TIMER), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(STATE_IRQ_MASK), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(ERROR_IRQ_MASK), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(STATE_IRQ_STATUS), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(ERROR_IRQ_STATUS), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(STATE_IRQ_CLR), da1469x_charger_reg_cmd, HELP(reg) },
- { REG_NAME(ERROR_IRQ_CLR), da1469x_charger_reg_cmd, HELP(reg) },
- { NULL, NULL, NULL }
+ SHELL_CMD(REG_NAME(CTRL), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(STATUS), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(VOLTAGE_PARAM), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(CURRENT_PARAM), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(TEMPSET_PARAM), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(PRE_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(CC_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(CV_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(TOTAL_CHARGE_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(JEITA_V_CHARGE), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(JEITA_V_PRECHARGE), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(JEITA_V_REPLENISH), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(JEITA_V_OVP), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(JEITA_CURRENT), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(VBAT_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(VOVP_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(TDIE_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(TBAT_MON_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(TBAT_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(THOT_COMP_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(PWR_UP_TIMER), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(STATE_IRQ_MASK), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(ERROR_IRQ_MASK), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(STATE_IRQ_STATUS), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(ERROR_IRQ_STATUS), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(STATE_IRQ_CLR), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(REG_NAME(ERROR_IRQ_CLR), da1469x_charger_reg_cmd, HELP(reg)),
+ SHELL_CMD(NULL, NULL, NULL)
};
int