From 541fcb884d4d40ee1ea970ac16370e0af9456348 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 9 Dec 2022 14:05:10 +0000 Subject: [PATCH] mgmt: mcumgr: Make handler registration functions static Makes group registration functions for MCUmgr handlers static as they are registered automatically at startup. Signed-off-by: Jamie McCrae --- include/zephyr/mgmt/mcumgr/grp/fs_mgmt/fs_mgmt.h | 5 ----- include/zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h | 10 ---------- include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h | 5 ----- include/zephyr/mgmt/mcumgr/grp/shell_mgmt/shell_mgmt.h | 6 ------ include/zephyr/mgmt/mcumgr/grp/stat_mgmt/stat_mgmt.h | 5 ----- subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c | 2 +- subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c | 8 +------- subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c | 2 +- subsys/mgmt/mcumgr/grp/shell_mgmt/src/shell_mgmt.c | 3 +-- subsys/mgmt/mcumgr/grp/stat_mgmt/src/stat_mgmt.c | 2 +- subsys/mgmt/mcumgr/grp/zephyr_basic/src/basic_mgmt.c | 2 +- 11 files changed, 6 insertions(+), 44 deletions(-) diff --git a/include/zephyr/mgmt/mcumgr/grp/fs_mgmt/fs_mgmt.h b/include/zephyr/mgmt/mcumgr/grp/fs_mgmt/fs_mgmt.h index 7288b428b90..d17072c402e 100644 --- a/include/zephyr/mgmt/mcumgr/grp/fs_mgmt/fs_mgmt.h +++ b/include/zephyr/mgmt/mcumgr/grp/fs_mgmt/fs_mgmt.h @@ -21,11 +21,6 @@ extern "C" { #define FS_MGMT_ID_HASH_CHECKSUM 2 #define FS_MGMT_ID_SUPPORTED_HASH_CHECKSUM 3 -/** - * @brief Registers the file system management command handler group. - */ -void fs_mgmt_register_group(void); - #ifdef __cplusplus } #endif diff --git a/include/zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h b/include/zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h index 6deff7ee3f9..3d75e0bac96 100644 --- a/include/zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h +++ b/include/zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt.h @@ -112,16 +112,6 @@ struct img_mgmt_upload_action { #endif }; -/** - * @brief Register the image management command handler group. - */ -void img_mgmt_register_group(void); - -/** - * @brief Unregister the image management command handler group. - */ -void img_mgmt_unregister_group(void); - /* * @brief Read info of an image at the specified slot number * diff --git a/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h b/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h index cd474b247bb..9a1c64b8c33 100644 --- a/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h +++ b/include/zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h @@ -83,11 +83,6 @@ struct os_mgmt_info_append { bool *prior_output; }; -/** - * @brief Registers the OS management command handler group. - */ -void os_mgmt_register_group(void); - #ifdef __cplusplus } #endif diff --git a/include/zephyr/mgmt/mcumgr/grp/shell_mgmt/shell_mgmt.h b/include/zephyr/mgmt/mcumgr/grp/shell_mgmt/shell_mgmt.h index 0d626f0b04d..f8e0d225611 100644 --- a/include/zephyr/mgmt/mcumgr/grp/shell_mgmt/shell_mgmt.h +++ b/include/zephyr/mgmt/mcumgr/grp/shell_mgmt/shell_mgmt.h @@ -16,12 +16,6 @@ extern "C" { */ #define SHELL_MGMT_ID_EXEC 0 -/** - * @brief Registers the shell management command handler group. - */ -void -shell_mgmt_register_group(void); - #ifdef __cplusplus } #endif diff --git a/include/zephyr/mgmt/mcumgr/grp/stat_mgmt/stat_mgmt.h b/include/zephyr/mgmt/mcumgr/grp/stat_mgmt/stat_mgmt.h index d7e6dbe6dac..302aa0dd0a6 100644 --- a/include/zephyr/mgmt/mcumgr/grp/stat_mgmt/stat_mgmt.h +++ b/include/zephyr/mgmt/mcumgr/grp/stat_mgmt/stat_mgmt.h @@ -25,11 +25,6 @@ struct stat_mgmt_entry { uint64_t value; }; -/** - * @brief Registers the statistics management command handler group. - */ -void stat_mgmt_register_group(void); - #ifdef __cplusplus } #endif diff --git a/subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c b/subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c index 48e4fb6409f..8f7b85fd20d 100644 --- a/subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c +++ b/subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c @@ -674,7 +674,7 @@ static struct mgmt_group fs_mgmt_group = { .mg_group_id = MGMT_GROUP_ID_FS, }; -void fs_mgmt_register_group(void) +static void fs_mgmt_register_group(void) { mgmt_register_group(&fs_mgmt_group); diff --git a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c index 680cfbe1ce6..2912a3d0629 100644 --- a/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c +++ b/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c @@ -611,15 +611,9 @@ static struct mgmt_group img_mgmt_group = { .mg_group_id = MGMT_GROUP_ID_IMAGE, }; - -void img_mgmt_register_group(void) +static void img_mgmt_register_group(void) { mgmt_register_group(&img_mgmt_group); } -void img_mgmt_unregister_group(void) -{ - mgmt_unregister_group(&img_mgmt_group); -} - MCUMGR_HANDLER_DEFINE(img_mgmt, img_mgmt_register_group); diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c index e0f05094e85..f9b32317b57 100644 --- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c +++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c @@ -676,7 +676,7 @@ static struct mgmt_group os_mgmt_group = { .mg_group_id = MGMT_GROUP_ID_OS, }; -void os_mgmt_register_group(void) +static void os_mgmt_register_group(void) { mgmt_register_group(&os_mgmt_group); } diff --git a/subsys/mgmt/mcumgr/grp/shell_mgmt/src/shell_mgmt.c b/subsys/mgmt/mcumgr/grp/shell_mgmt/src/shell_mgmt.c index a6d428ae3b2..8bd6d688809 100644 --- a/subsys/mgmt/mcumgr/grp/shell_mgmt/src/shell_mgmt.c +++ b/subsys/mgmt/mcumgr/grp/shell_mgmt/src/shell_mgmt.c @@ -135,8 +135,7 @@ static struct mgmt_group shell_mgmt_group = { .mg_group_id = MGMT_GROUP_ID_SHELL, }; - -void shell_mgmt_register_group(void) +static void shell_mgmt_register_group(void) { mgmt_register_group(&shell_mgmt_group); } diff --git a/subsys/mgmt/mcumgr/grp/stat_mgmt/src/stat_mgmt.c b/subsys/mgmt/mcumgr/grp/stat_mgmt/src/stat_mgmt.c index 8cd37d17d90..f4c28c4814b 100644 --- a/subsys/mgmt/mcumgr/grp/stat_mgmt/src/stat_mgmt.c +++ b/subsys/mgmt/mcumgr/grp/stat_mgmt/src/stat_mgmt.c @@ -238,7 +238,7 @@ static struct mgmt_group stat_mgmt_group = { .mg_group_id = MGMT_GROUP_ID_STAT, }; -void stat_mgmt_register_group(void) +static void stat_mgmt_register_group(void) { mgmt_register_group(&stat_mgmt_group); } diff --git a/subsys/mgmt/mcumgr/grp/zephyr_basic/src/basic_mgmt.c b/subsys/mgmt/mcumgr/grp/zephyr_basic/src/basic_mgmt.c index c893f818f66..957b7f49d3e 100644 --- a/subsys/mgmt/mcumgr/grp/zephyr_basic/src/basic_mgmt.c +++ b/subsys/mgmt/mcumgr/grp/zephyr_basic/src/basic_mgmt.c @@ -60,7 +60,7 @@ static struct mgmt_group zephyr_basic_mgmt_group = { .mg_group_id = (ZEPHYR_MGMT_GRP_BASIC), }; -void zephyr_basic_mgmt_init(void) +static void zephyr_basic_mgmt_init(void) { mgmt_register_group(&zephyr_basic_mgmt_group); }