mgmt: mcumgr: os_mgmt: Switch to new event callback system

Switches to the new event callback system for the os_mgmt
functionality and removes the old code.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

Author: nordicjm

include/zephyr/mgmt/mcumgr/mgmt/callbacks.h

@@ -74,6 +74,7 @@ typedef int32_t (*mgmt_cb)(uint32_t event, int32_t rc, bool *abort_more, void *d
 enum mgmt_cb_groups {
 	MGMT_EVT_GRP_ALL			= 0,
 	MGMT_EVT_GRP_SMP,
+	MGMT_EVT_GRP_OS,
 	MGMT_EVT_GRP_IMG,
 	MGMT_EVT_GRP_FS,
 
@@ -139,6 +140,17 @@ enum img_mgmt_group_events {
 	MGMT_EVT_OP_IMG_MGMT_ALL		= MGMT_DEF_EVT_OP_ALL(MGMT_EVT_GRP_IMG),
 };
 
+/**
+ * MGMT event opcodes for operating system management group.
+ */
+enum os_mgmt_group_events {
+	/** Callback when a reset command has been received. */
+	MGMT_EVT_OP_OS_MGMT_RESET		= MGMT_DEF_EVT_OP_ID(MGMT_EVT_GRP_OS, 0),
+
+	/** Used to enable all os_mgmt_group events. */
+	MGMT_EVT_OP_OS_MGMT_ALL			= MGMT_DEF_EVT_OP_ALL(MGMT_EVT_GRP_OS),
+};
+
 /**
  * MGMT callback struct
  */

subsys/mgmt/mcumgr/lib/cmd/os_mgmt/Kconfig

@@ -19,9 +19,10 @@ config OS_MGMT_RESET_MS
 	  before performing the reset.  This delay allows time for the mcumgr
 	  response to be delivered.
 
-config OS_MGMT_RESET_HOOK
+config MCUMGR_GRP_OS_OS_RESET_HOOK
 	bool "Reset hook"
 	depends on REBOOT
+	depends on MCUMGR_MGMT_NOTIFICATION_HOOKS
 	help
 	  Allows applications to control and get notifications of when a reset
 	  command has been issued via an mcumgr command. With this option

subsys/mgmt/mcumgr/lib/cmd/os_mgmt/include/os_mgmt/os_mgmt.h

@@ -23,32 +23,11 @@ extern "C" {
 #define OS_MGMT_ID_RESET		5
 #define OS_MGMT_ID_MCUMGR_PARAMS	6
 
-#ifdef CONFIG_OS_MGMT_RESET_HOOK
-/** @typedef os_mgmt_on_reset_evt_cb
- * @brief Function to be called on os mgmt reset event.
- *
- * This callback function is used to notify the application about a pending
- * reset request and to authorise or deny it.
- *
- * @return 0 to allow reset, MGMT_ERR_[...] code to disallow reset.
- */
-typedef int (*os_mgmt_on_reset_evt_cb)(void);
-#endif
-
 /**
  * @brief Registers the OS management command handler group.
  */
 void os_mgmt_register_group(void);
 
-#ifdef CONFIG_OS_MGMT_RESET_HOOK
-/**
- * @brief Register os reset event callback function.
- *
- * @param cb Callback function or NULL to disable.
- */
-void os_mgmt_register_reset_evt_cb(os_mgmt_on_reset_evt_cb cb);
-#endif
-
 #ifdef __cplusplus
 }
 #endif

subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c

@@ -20,6 +20,10 @@
 #include <zephyr/sys/reboot.h>
 #endif
 
+#ifdef CONFIG_MCUMGR_MGMT_NOTIFICATION_HOOKS
+#include <zephyr/mgmt/mcumgr/mgmt/callbacks.h>
+#endif
+
 #include "mgmt/mgmt.h"
 #include <smp/smp.h>
 #include "os_mgmt/os_mgmt.h"
@@ -41,10 +45,6 @@ static K_TIMER_DEFINE(os_mgmt_reset_timer, os_mgmt_reset_cb, NULL);
  */
 #define TASKSTAT_COLUMNS_MAX	20
 
-#ifdef CONFIG_OS_MGMT_RESET_HOOK
-static os_mgmt_on_reset_evt_cb os_reset_evt_cb;
-#endif
-
 #ifdef CONFIG_OS_MGMT_TASKSTAT
 /* Thread iterator information passing structure */
 struct thread_iterator_info {
@@ -288,16 +288,11 @@ static void os_mgmt_reset_cb(struct k_timer *timer)
 
 static int os_mgmt_reset(struct smp_streamer *ctxt)
 {
-#ifdef CONFIG_OS_MGMT_RESET_HOOK
-	int rc;
-
-	if (os_reset_evt_cb != NULL) {
-		/* Check with application prior to accepting reset */
-		rc = os_reset_evt_cb();
+#if defined(CONFIG_MCUMGR_GRP_OS_OS_RESET_HOOK)
+	int rc = mgmt_callback_notify(MGMT_EVT_OP_OS_MGMT_RESET, NULL, 0);
 
-		if (rc != 0) {
-			return rc;
-		}
+	if (rc != MGMT_ERR_EOK) {
+		return rc;
 	}
 #endif
 
@@ -363,10 +358,3 @@ void os_mgmt_module_init(void)
 {
 	os_mgmt_register_group();
 }
-
-#ifdef CONFIG_OS_MGMT_RESET_HOOK
-void os_mgmt_register_reset_evt_cb(os_mgmt_on_reset_evt_cb cb)
-{
-	os_reset_evt_cb = cb;
-}
-#endif