apache · kasjer · May 23, 2025 · May 30, 2025 · May 30, 2025 · May 30, 2025
diff --git a/fs/fs/pkg.yml b/fs/fs/pkg.yml
@@ -34,3 +34,5 @@ pkg.deps.FS_CLI:
 
 pkg.deps.FS_MGMT:
     - "@apache-mynewt-mcumgr/cmd/fs/port/mynewt"
+
+pkg.whole_archive: true
diff --git a/fs/fs/src/fs_cli.c b/fs/fs/src/fs_cli.c
@@ -29,51 +29,24 @@
 
 #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)
+fs_ls_file(struct streamer *streamer, const char *name, struct fs_file *file)
 {
     uint32_t len;
 
     len = 0;
     fs_filelen(file, &len);
-    console_printf("\t%6lu %s\n", (unsigned long)len, name);
+    streamer_printf(streamer, "\t%6lu %s\n", (unsigned long)len, name);
 }
 
 static void
-fs_ls_dir(const char *name)
+fs_ls_dir(struct streamer *streamer, const char *name)
 {
-    console_printf("\t%6s %s\n", "dir", name);
+    streamer_printf(streamer, "\t%6s %s\n", "dir", name);
 }
 
 static int
-fs_ls_cmd(int argc, char **argv)
+fs_ls_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer)
 {
     int rc, file_cnt = 0;
     char *path;
@@ -92,13 +65,13 @@ fs_ls_cmd(int argc, char **argv)
         path = argv[1];
         break;
     default:
-        console_printf("ls <path>\n");
+        streamer_printf(streamer, "ls <path>\n");
         return 1;
     }
 
     rc = fs_open(path, FS_ACCESS_READ, &file);
     if (rc == 0) {
-        fs_ls_file(path, file);
+        fs_ls_file(streamer, path, file);
         fs_close(file);
         file_cnt = 1;
         goto done;
@@ -124,24 +97,24 @@ fs_ls_cmd(int argc, char **argv)
             }
             rc = fs_open(name, FS_ACCESS_READ, &file);
             if (rc == 0) {
-                fs_ls_file(name, file);
+                fs_ls_file(streamer, name, file);
                 fs_close(file);
             } else {
-                fs_ls_dir(name);
+                fs_ls_dir(streamer, name);
             }
             file_cnt++;
         } while (1);
         fs_closedir(dir);
         goto done;
     }
-    console_printf("Error listing %s - %d\n", path, rc);
+    streamer_printf(streamer, "Error listing %s - %d\n", path, rc);
 done:
-    console_printf("%d files\n", file_cnt);
+    streamer_printf(streamer, "%d files\n", file_cnt);
     return 0;
 }
 
 static int
-fs_rm_cmd(int argc, char **argv)
+fs_rm_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer)
 {
     int i;
     int rc;
@@ -156,22 +129,22 @@ fs_rm_cmd(int argc, char **argv)
 }
 
 static int
-fs_mkdir_cmd(int argc, char **argv)
+fs_mkdir_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer)
 {
     int i;
     int rc;
 
     for (i = 1; i < argc; i++) {
         rc = fs_mkdir(argv[1]);
         if (rc) {
-            console_printf("Error creating %s - %d\n", argv[i], rc);
+            streamer_printf(streamer, "Error creating %s - %d\n", argv[i], rc);
         }
     }
     return 0;
 }
 
 static int
-fs_mv_cmd(int argc, char **argv)
+fs_mv_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer)
 {
     int rc;
 
@@ -182,51 +155,48 @@ fs_mv_cmd(int argc, char **argv)
     rc = fs_rename(argv[1], argv[2]);
 out:
     if (rc) {
-        console_printf("Error moving - %d\n", rc);
+        streamer_printf(streamer, "Error moving - %d\n", rc);
     }
     return 0;
 }
 
 static int
-fs_cat_cmd(int argc, char **argv)
+fs_cat_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer *streamer)
 {
     int rc;
     struct fs_file *file;
     char buf[32];
     uint32_t len;
 
     if (argc != 2) {
-        console_printf("cat <filename>\n");
+        streamer_printf(streamer, "cat <filename>\n");
         return -1;
     }
 
     rc = fs_open(argv[1], FS_ACCESS_READ, &file);
     if (rc != FS_EOK) {
-        console_printf("Error opening %s - %d\n", argv[1], rc);
+        streamer_printf(streamer, "Error opening %s - %d\n", argv[1], rc);
         return -1;
     }
 
     do {
         rc = fs_read(file, sizeof(buf), buf, &len);
         if (rc != FS_EOK) {
-            console_printf("\nError reading %s - %d\n", argv[1], rc);
+            streamer_printf(streamer, "\nError reading %s - %d\n", argv[1], rc);
             break;
         }
-        console_write(buf, len);
+        streamer_write(streamer, buf, len);
     } while (len > 0);
 
     fs_close(file);
 
     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) */
diff --git a/fs/fs/src/fs_mount.c b/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();

diff --git a/fs/fs/src/fs_priv.h b/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
 }

diff --git a/hw/mcu/stm/stm32f1xx/mcu_cli/pkg.yml b/hw/mcu/stm/stm32f1xx/mcu_cli/pkg.yml
@@ -28,5 +28,4 @@ pkg.deps:
 pkg.req_apis:
     - console
 
-pkg.init:
-    mcu_cli_init: 'MYNEWT_VAL(MCU_CLI_SYSINIT_STAGE)'
+pkg.whole_archive: true
diff --git a/hw/mcu/stm/stm32f1xx/mcu_cli/src/mcu_cli.c b/hw/mcu/stm/stm32f1xx/mcu_cli/src/mcu_cli.c
@@ -277,13 +277,6 @@ static const struct shell_cmd_help mcu_cli_info_help = {
 
 static const struct shell_cmd mcu_cli_commands[] = {
     SHELL_CMD_EXT("info", mcu_cli_info_cmd, &mcu_cli_info_help),
-    { },
 };
 
-int
-mcu_cli_init(void)
-{
-    shell_register("mcu", mcu_cli_commands);
-
-    return 0;
-}
+SHELL_MODULE_WITH_TABLE(mcu, mcu_cli_commands)
diff --git a/hw/mcu/stm/st 2851 m32f1xx/mcu_cli/syscfg.yml b/hw/mcu/stm/st 2851 m32f1xx/mcu_cli/syscfg.yml
@@ -15,7 +15,3 @@
 #
 
 syscfg.defs:
-    MCU_CLI_SYSINIT_STAGE:
-        description: >
-            Sysinit stage for mcu cli.
-        value: 501
diff --git a/hw/mcu/stm/stm32f4xx/mcu_cli/pkg.yml b/hw/mcu/stm/stm32f4xx/mcu_cli/pkg.yml
@@ -31,5 +31,4 @@ pkg.deps:
 pkg.req_apis:
     - console
 
-pkg.init:
-    mcu_cli_init: 'MYNEWT_VAL(MCU_CLI_SYSINIT_STAGE)'
+pkg.whole_archive: true
diff --git a/hw/mcu/stm/stm32f4xx/mcu_cli/src/mcu_cli.c b/hw/mcu/stm/stm32f4xx/mcu_cli/src/mcu_cli.c
@@ -424,13 +424,6 @@ static const struct shell_cmd_help mcu_cli_info_help = {
 
 static const struct shell_cmd mcu_cli_commands[] = {
     SHELL_CMD_EXT("info", mcu_cli_info_cmd, &mcu_cli_info_help),
-    { },
 };
 
-int
-mcu_cli_init(void)
-{
-    shell_register("mcu", mcu_cli_commands);
-
-    return 0;
-}
+SHELL_MODULE_WITH_TABLE(mcu, mcu_cli_commands)
diff --git a/hw/mcu/stm/stm32f4xx/mcu_cli/syscfg.yml b/hw/mcu/stm/stm32f4xx/mcu_cli/syscfg.yml
@@ -18,7 +18,3 @@
 #
 
 syscfg.defs:
-    MCU_CLI_SYSINIT_STAGE:
-        description: >
-            Sysinit stage for mcu cli.
-        value: 501
diff --git a/hw/usb/tinyusb/shell/pkg.yml b/hw/usb/tinyusb/shell/pkg.yml
@@ -29,5 +29,4 @@ pkg.deps:
     - "@apache-mynewt-core/kernel/os"
     - "@apache-mynewt-core/hw/usb/tinyusb"
 
-pkg.init:
-    tinyusb_cli_init: 'MYNEWT_VAL(SHELL_SYSINIT_STAGE) + 1'
+pkg.whole_archive: true
diff --git a/hw/usb/tinyusb/shell/src/tinyusb_cli.c b/hw/usb/tinyusb/shell/src/tinyusb_cli.c
@@ -50,13 +50,6 @@ usb_cli_stop_cmd(const struct shell_cmd *cmd, int argc, char **argv,
 static const struct shell_cmd usb_cli_commands[] = {
     SHELL_CMD_EXT("start", usb_cli_start_cmd, NULL),
     SHELL_CMD_EXT("stop", usb_cli_stop_cmd, NULL),
-    { },
 };
 
-int
-tinyusb_cli_init(void)
-{
-    shell_register("usb", usb_cli_commands);
-
-    return 0;
-}
+SHELL_MODULE_WITH_TABLE(usb, usb_cli_commands)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,5 @@ pkg.deps.FS_CLI:

		pkg.deps.FS_MGMT:
		- "@apache-mynewt-mcumgr/cmd/fs/port/mynewt"

		pkg.whole_archive: true