update shell commands to static registration

fs/fs/pkg.yml

@@ -34,3 +34,5 @@ pkg.deps.FS_CLI:
 
 pkg.deps.FS_MGMT:
     - "@apache-mynewt-mcumgr/cmd/fs_mgmt/port/mynewt"
+
+pkg.whole_archive: true

fs/fs/src/fs_cli.c

@@ -29,33 +29,6 @@
 
 #include "fs/fs.h"
 
-static int fs_ls_cmd(int argc, char **argv);
-static int fs_rm_cmd(int argc, char **argv);
-static int fs_mkdir_cmd(int argc, char **argv);
-static int fs_mv_cmd(int argc, char **argv);
-static int fs_cat_cmd(int argc, char **argv);
-
-static struct shell_cmd fs_ls_struct = {
-    .sc_cmd = "ls",
-    .sc_cmd_func = fs_ls_cmd
-};
-static struct shell_cmd fs_rm_struct = {
-    .sc_cmd = "rm",
-    .sc_cmd_func = fs_rm_cmd
-};
-static struct shell_cmd fs_mkdir_struct = {
-    .sc_cmd = "mkdir",
-    .sc_cmd_func = fs_mkdir_cmd
-};
-static struct shell_cmd fs_mv_struct = {
-    .sc_cmd = "mv",
-    .sc_cmd_func = fs_mv_cmd
-};
-static struct shell_cmd fs_cat_struct = {
-    .sc_cmd = "cat",
-    .sc_cmd_func = fs_cat_cmd
-};
-
 static void
 fs_ls_file(const char *name, struct fs_file *file)
 {
@@ -220,13 +193,10 @@ fs_cat_cmd(int argc, char **argv)
     return 0;
 }
 
-void
-fs_cli_init(void)
-{
-    shell_cmd_register(&fs_ls_struct);
-    shell_cmd_register(&fs_rm_struct);
-    shell_cmd_register(&fs_mkdir_struct);
-    shell_cmd_register(&fs_mv_struct);
-    shell_cmd_register(&fs_cat_struct);
-}
+MAKE_SHELL_CMD(ls, fs_ls_cmd, NULL)
+MAKE_SHELL_CMD(rm, fs_rm_cmd, NULL)
+MAKE_SHELL_CMD(mkdir, fs_mkdir_cmd, NULL)
+MAKE_SHELL_CMD(mv, fs_mv_cmd, NULL)
+MAKE_SHELL_CMD(cat, fs_cat_cmd, NULL)
+
 #endif /* MYNEWT_VAL(FS_CLI) */

fs/fs/src/fs_mount.c

@@ -28,10 +28,6 @@
 
 static SLIST_HEAD(, fs_ops) root_fops = SLIST_HEAD_INITIALIZER();
 
-#if MYNEWT_VAL(FS_CLI)
-static uint8_t g_cli_initialized;
-#endif
-
 #if MYNEWT_VAL(FS_MGMT)
 static uint8_t g_mgmt_initialized;
 #endif
@@ -49,13 +45,6 @@ fs_register(struct fs_ops *fops)
 
     SLIST_INSERT_HEAD(&root_fops, fops, sc_next);
 
-#if MYNEWT_VAL(FS_CLI)
-    if (!g_cli_initialized) {
-        fs_cli_init();
-        g_cli_initialized = 1;
-    }
-#endif
-
 #if MYNEWT_VAL(FS_MGMT)
     if (!g_mgmt_initialized) {
         fs_mgmt_register_group();

fs/fs/src/fs_priv.h

@@ -29,9 +29,6 @@ struct fs_ops;
 struct fs_ops *fs_ops_for(const char *fs_name);
 struct fs_ops *safe_fs_ops_for(const char *fs_name);
 
-#if MYNEWT_VAL(FS_CLI)
-void fs_cli_init(void);
-#endif
 
 #ifdef __cplusplus
 }

hw/battery/include/battery/battery.h

@@ -301,10 +301,6 @@ int battery_get_driver_count(struct os_dev *battery);
 struct battery_driver *get_battery_driver(struct os_dev *battery,
         const char *dev_name);
 
-#if MYNEWT_VAL(BATTERY_SHELL)
-void battery_shell_register(void);
-#endif
-
 /**
  * }@
  */

hw/battery/pkg.yml

@@ -28,5 +28,7 @@ pkg.deps:
 pkg.req_apis:
     - console
 
+pkg.whole_archive: true
+
 pkg.init:
     battery_pkg_init: 'MYNEWT_VAL(BATTERY_SYSINIT_STAGE)'

hw/battery/src/battery.c

@@ -142,10 +142,6 @@ battery_pkg_init(void)
     SYSINIT_ASSERT_ACTIVE();
 
     battery_mgr_init();
-
-#if MYNEWT_VAL(BATTERY_SHELL)
-    battery_shell_register();
-#endif
 }
 
 int

hw/battery/src/battery_shell.c

@@ -30,8 +30,6 @@
 #include <battery/battery.h>
 #include <battery/battery_prop.h>
 
-static int bat_compat_cmd(int argc, char **argv);
-
 #if MYNEWT_VAL(SHELL_CMD_HELP)
 #define HELP(a) &(a)
 
@@ -78,37 +76,6 @@ static const struct shell_cmd_help bat_monitor_help = {
 #define HELP(a) NULL
 #endif
 
-static const struct shell_cmd bat_cli_cmd = {
-    .sc_cmd = "bat",
-    .sc_cmd_func = bat_compat_cmd,
-};
-
-/**
- * cmd bat help
- *
- * Help for the bat command.
- *
- */
-static void
-cmd_bat_help(void)
-{
-    console_printf("Usage: bat <cmd> [options]\n");
-    console_printf("Available bat commands:\n");
-    console_printf("  pollrate <time_in_s>\n");
-    console_printf("  monitor [<prop>] [off]\n");
-    console_printf("  list\n");
-    console_printf("  read [<prop>] | all\n");
-    console_printf("  write <prop> <value>\n");
-
-    console_printf("Examples:\n");
-    console_printf("  list\n");
-    console_printf("  monitor VoltageADC\n");
-    console_printf("  monitor off\n");
-    console_printf("  read Voltage\n");
-    console_printf("  read all\n");
-    console_printf("  write VoltageLoAlarmSet\n");
-}
-
 static const char *bat_status[] = {
     "???",
     "charging",
@@ -482,57 +449,8 @@ static const struct shell_cmd bat_cli_commands[] = {
     SHELL_CMD("list", cmd_bat_list, &bat_list_help),
     SHELL_CMD("pollrate", cmd_bat_poll_rate, &bat_poll_rate_help),
     SHELL_CMD("monitor", cmd_bat_monitor, &bat_monitor_help),
-    { 0 },
 };
 
-/**
- * bat cmd
- *
- * Main processing function for K4 cli bat command
- *
- * @param argc Number of arguments
- * @param argv Argument list
- *
- * @return int 0: success, -1 error
- */
-static int
-bat_compat_cmd(int argc, char **argv)
-{
-    int rc;
-    int i;
-
-    if (argc < 2) {
-        rc = SYS_EINVAL;
-    } else {
-        for (i = 0; bat_cli_commands[i].sc_cmd; ++i) {
-            if (strcmp(bat_cli_commands[i].sc_cmd, argv[1]) == 0) {
-                rc = bat_cli_commands[i].sc_cmd_func(argc - 1, argv + 1);
-                break;
-            }
-        }
-        /* No command found */
-        if (bat_cli_commands[i].sc_cmd == NULL) {
-            console_printf("Invalid command.\n");
-            rc = -1;
-        }
-    }
-
-    /* Print help in case of error */
-    if (rc) {
-        cmd_bat_help();
-    }
-
-    return rc;
-}
-
-void
-battery_shell_register(void)
-{
-    int rc;
-
-    rc = shell_register("bat", bat_cli_commands);
-    rc = shell_cmd_register(&bat_cli_cmd);
-    SYSINIT_PANIC_ASSERT_MSG(rc == 0, "Failed to register battery shell");
-}
+SHELL_MODULE_WITH_TABLE(bat, bat_cli_commands)
 
 #endif

hw/drivers/bq27z561/include/bq27z561/bq27z561.h

@@ -634,15 +634,6 @@ int bq27z561_config(struct bq27z561 * bq27z561, struct bq27z561_cfg * cfg);
  */
 int bq27z561_init(struct os_dev * dev, void * arg);
 
-#if MYNEWT_VAL(BQ27Z561_CLI)
-/**
- * Initialize the BQ27Z561 shell extensions.
- *
- * @return 0 on success, non-zero on failure.
- */
-int bq27z561_shell_init(void);
-#endif
-
 #if MYNEWT_VAL(BUS_DRIVER_PRESENT)
 /**
  * Create I2C bus node for BQ27Z561

hw/drivers/bq27z561/pkg.yml

@@ -38,8 +38,8 @@ pkg.deps.BUS_DRIVER_PRESENT:
 pkg.req_apis:
     - stats
 
+pkg.whole_archive: true
+
 pkg.deps.BQ27Z561_CLI:
     - "@apache-mynewt-core/util/parse"
 
-pkg.init:
-    bq27z561_pkg_init: 'MYNEWT_VAL(BQ27Z561_SYSINIT_STAGE)'

hw/drivers/bq27z561/src/bq27z561.c

@@ -1348,15 +1348,6 @@ bq27z561_init(struct os_dev *dev, void *arg)
     return 0;
 }
 
-int bq27z561_pkg_init(void)
-{
-#if MYNEWT_VAL(BQ27Z561_CLI)
-    return bq27z561_shell_init();
-#else
-    return 0;
-#endif
-}
-
 #if MYNEWT_VAL(BUS_DRIVER_PRESENT)
 static void
 init_node_cb(struct bus_node *bnode, void *arg)

hw/drivers/bq27z561/src/bq27z561_shell.c

@@ -113,15 +113,6 @@ bq27z561_shell_cmd(int argc, char * argv[])
     return 0;
 }
 
-static const struct shell_cmd bq27z561_shell_cmd_desc = {
-    .sc_cmd      = "bq27z561",
-    .sc_cmd_func = bq27z561_shell_cmd,
-};
-
-int
-bq27z561_shell_init(void)
-{
-    return shell_cmd_register(&bq27z561_shell_cmd_desc);
-}
+MAKE_SHELL_CMD(bq27z561, bq27z561_shell_cmd, NULL)
 
 #endif

hw/drivers/bq27z561/syscfg.yml

@@ -39,10 +39,6 @@ syscfg.defs:
         description: >
             Number of OS ticks to wait for each I2C transaction to complete.
         value: 6
-    BQ27Z561_SYSINIT_STAGE:
-        description: >
-            Sysinit stage for the BQ27Z561 driver.
-        value: 500
 
     ### Log settings.
 

hw/drivers/chg_ctrl/adp5061/pkg.yml

@@ -39,3 +39,5 @@ pkg.deps.!BUS_DRIVER_PRESENT||ADP5061_USE_CHARGE_CONTROL:
 pkg.deps.ADP5061_CLI:
     - '@apache-mynewt-core/sys/shell'
     - '@apache-mynewt-core/util/parse'
+
+pkg.whole_archive: true

hw/drivers/chg_ctrl/adp5061/src/adp5061.c

@@ -23,7 +23,6 @@
 
 #include <os/mynewt.h>
 #include <console/console.h>
-#include <mcu/nrf52_hal.h>
 #include <hal/hal_gpio.h>
 #if MYNEWT_VAL(BUS_DRIVER_PRESENT)
 #include "bus/drivers/i2c_common.h"
@@ -675,10 +674,6 @@ adp5061_init(struct os_dev *dev, void *arg)
     }
 #endif /* ADP5061_USE_CHARGE_CONTROL */
 
-#if MYNEWT_VAL(ADP5061_CLI)
-    adp5061_shell_init(adp5061);
-#endif
-
     return 0;
 err:
     return rc;

hw/drivers/chg_ctrl/adp5061/src/adp5061_shell.c

@@ -624,13 +624,6 @@ static const struct adp5061_reg adp5061_device_regs[] = {
 #define NUM_DEVICE_REGS (sizeof(adp5061_device_regs)\
                         /sizeof(adp5061_device_regs[0]))
 
-static int adp5061_shell_cmd(int argc, char **argv);
-
-static const struct shell_cmd adp5061_shell_cmd_struct = {
-    .sc_cmd = "adp5061",
-    .sc_cmd_func = adp5061_shell_cmd
-};
-
 static int
 adp5061_shell_err_too_many_args(const char *cmd_name)
 {
@@ -665,7 +658,7 @@ adp5061_shell_err_missing_arg(const char *cmd_name)
 static int
 adp5061_shell_help(void)
 {
-    console_printf("%s cmd\n", adp5061_shell_cmd_struct.sc_cmd);
+    console_printf("adp5061 cmd\n");
     console_printf("cmd:\n");
     console_printf("\thelp\n");
 #if MYNEWT_VAL(ADP5061_CLI_DECODE)
@@ -970,16 +963,14 @@ adp5061_shell_cmd(int argc, char **argv)
     return adp5061_shell_err_unknown_arg(argv[1]);
 }
 
+MAKE_SHELL_CMD(adp5061, adp5061_shell_cmd, NULL);
+
 int
 adp5061_shell_init(struct adp5061_dev *dev)
 {
-    int rc;
-
     adp5061_dev = dev;
-    rc = shell_cmd_register(&adp5061_shell_cmd_struct);
-    SYSINIT_PANIC_ASSERT(rc == 0);
 
-    return rc;
+    return 0;
 }
 
 #endif

hw/drivers/rtc/ds1307/pkg.yml

@@ -35,8 +35,13 @@ pkg.req_apis:
     - log
     - stats
 
+pkg.whole_archive: true
+
+pkg.source_files:
+    - src/ds1307.c
+
+pkg.source_files.DS1307_CLI:
+    - src/ds1307_shell.c
+
 pkg.init:
     ds1307_pkg_init: 601
-
-pkg.init.DS1307_CLI:
-    ds1307_shell_init: 1000