mgmt: mcumgr: grp: img_mgmt: Use common reset function

Replaces the img_mgmt specific function with the common SMP
function for resetting the zcbor buffer and allowing a new response
to be sent

Signed-off-by: Jamie McCrae <[email protected]>

Author: thedjnK

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

@@ -130,22 +130,6 @@ void img_mgmt_release_lock(void)
 #endif
 }
 
-#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO_HOOKS)
-static bool img_mgmt_reset_zse(struct smp_streamer *ctxt)
-{
-	zcbor_state_t *zse = ctxt->writer->zs;
-
-	/* Because there is already data in the buffer, it must be cleared first */
-	net_buf_reset(ctxt->writer->nb);
-	ctxt->writer->nb->len = sizeof(struct smp_hdr);
-	zcbor_new_encode_state(zse, ARRAY_SIZE(ctxt->writer->zs),
-			       ctxt->writer->nb->data + sizeof(struct smp_hdr),
-			       net_buf_tailroom(ctxt->writer->nb), 0);
-
-	return zcbor_map_start_encode(zse, CONFIG_MCUMGR_SMP_CBOR_MAX_MAIN_MAP_ENTRIES);
-}
-#endif
-
 #if defined(CONFIG_MCUMGR_GRP_IMG_TOO_LARGE_SYSBUILD)
 static bool img_mgmt_slot_max_size(size_t *area_sizes, zcbor_state_t *zse)
 {
@@ -597,7 +581,7 @@ static int img_mgmt_slot_info(struct smp_streamer *ctxt)
 					return err_rc;
 				}
 
-				ok = img_mgmt_reset_zse(ctxt) &&
+				ok = smp_mgmt_reset_zse(ctxt) &&
 				     smp_add_cmd_err(zse, err_group, (uint16_t)err_rc);
 
 				goto finish;
@@ -645,7 +629,7 @@ static int img_mgmt_slot_info(struct smp_streamer *ctxt)
 					return err_rc;
 				}
 
-				ok = img_mgmt_reset_zse(ctxt) &&
+				ok = smp_mgmt_reset_zse(ctxt) &&
 				     smp_add_cmd_err(zse, err_group, (uint16_t)err_rc);
 
 				goto finish;

subsys/mgmt/mcumgr/transport/include/mgmt/mcumgr/transport/smp_internal.h

@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net_buf.h>
+#include <zephyr/mgmt/mcumgr/smp/smp.h>
 #include <zephyr/mgmt/mcumgr/transport/smp.h>
 #include <zcbor_encode.h>