mgmt/mcumgr: Remove mgmt_streamer structure

There are no more functions directly using the type, so it
has been removed and its contents have been moved to
smp_streamer.

Signed-off-by: Dominik Ermel <[email protected]>

Author: de-nordic

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

@@ -131,15 +131,6 @@ typedef void *(*mgmt_alloc_rsp_fn)(const void *src_buf, void *arg);
  */
 typedef void (*mgmt_reset_buf_fn)(void *buf, void *arg);
 
-/**
- * @brief Decodes requests and encodes responses for any mcumgr protocol.
- */
-struct mgmt_streamer {
-	void *cb_arg;
-	struct cbor_nb_reader *reader;
-	struct cbor_nb_writer *writer;
-};
-
 /**
  * @brief Context required by command handlers for parsing requests and writing
  *		responses.

subsys/mgmt/mcumgr/lib/smp/include/smp/smp.h

@@ -49,7 +49,9 @@ typedef int smp_tx_rsp_fn(struct smp_streamer *ss, void *buf, void *arg);
  * @brief Decodes, encodes, and transmits SMP packets.
  */
 struct smp_streamer {
-	struct mgmt_streamer mgmt_stmr;
+	struct zephyr_smp_transport *smpt;
+	struct cbor_nb_reader *reader;
+	struct cbor_nb_writer *writer;
 	smp_tx_rsp_fn *tx_rsp_cb;
 };
 

subsys/mgmt/mcumgr/lib/smp/src/smp.c

@@ -59,7 +59,7 @@ smp_read_hdr(const struct net_buf *nb, struct mgmt_hdr *dst_hdr)
 static inline int
 smp_write_hdr(struct smp_streamer *streamer, const struct mgmt_hdr *src_hdr)
 {
-	memcpy(streamer->mgmt_stmr.writer->nb->data, src_hdr, sizeof(*src_hdr));
+	memcpy(streamer->writer->nb->data, src_hdr, sizeof(*src_hdr));
 	return 0;
 }
 
@@ -68,7 +68,7 @@ smp_build_err_rsp(struct smp_streamer *streamer, const struct mgmt_hdr *req_hdr,
 		  const char *rc_rsn)
 {
 	struct mgmt_hdr rsp_hdr;
-	struct cbor_nb_writer *nbw = (struct cbor_nb_writer *)streamer->mgmt_stmr.writer;
+	struct cbor_nb_writer *nbw = streamer->writer;
 	zcbor_state_t *zsp = nbw->zs;
 	bool ok;
 
@@ -173,8 +173,8 @@ smp_handle_single_req(struct smp_streamer *streamer, const struct mgmt_hdr *req_
 {
 	struct mgmt_ctxt cbuf;
 	struct mgmt_hdr rsp_hdr;
-	struct cbor_nb_writer *nbw = (struct cbor_nb_writer *)streamer->mgmt_stmr.writer;
-	struct cbor_nb_reader *nbr = (struct cbor_nb_reader *)streamer->mgmt_stmr.reader;
+	struct cbor_nb_writer *nbw = streamer->writer;
+	struct cbor_nb_reader *nbr = streamer->reader;
 	zcbor_state_t *zsp = nbw->zs;
 	int rc;
 
@@ -223,18 +223,18 @@ smp_on_err(struct smp_streamer *streamer, const struct mgmt_hdr *req_hdr,
 	}
 
 	/* Clear the partial response from the buffer, if any. */
-	cbor_nb_writer_init(streamer->mgmt_stmr.writer, rsp);
+	cbor_nb_writer_init(streamer->writer, rsp);
 
 	/* Build and transmit the error response. */
 	rc = smp_build_err_rsp(streamer, req_hdr, status, rsn);
 	if (rc == 0) {
-		streamer->tx_rsp_cb(streamer, rsp, streamer->mgmt_stmr.cb_arg);
+		streamer->tx_rsp_cb(streamer, rsp, streamer->smpt);
 		rsp = NULL;
 	}
 
 	/* Free any extra buffers. */
-	zephyr_smp_free_buf(req, streamer->mgmt_stmr.cb_arg);
-	zephyr_smp_free_buf(rsp, streamer->mgmt_stmr.cb_arg);
+	zephyr_smp_free_buf(req, streamer->smpt);
+	zephyr_smp_free_buf(rsp, streamer->smpt);
 }
 
 /**
@@ -290,14 +290,14 @@ smp_process_request_packet(struct smp_streamer *streamer, void *vreq)
 			break;
 		}
 
-		rsp = zephyr_smp_alloc_rsp(req, streamer->mgmt_stmr.cb_arg);
+		rsp = zephyr_smp_alloc_rsp(req, streamer->smpt);
 		if (rsp == NULL) {
 			rc = MGMT_ERR_ENOMEM;
 			break;
 		}
 
-		cbor_nb_reader_init(streamer->mgmt_stmr.reader, req);
-		cbor_nb_writer_init(streamer->mgmt_stmr.writer, rsp);
+		cbor_nb_reader_init(streamer->reader, req);
+		cbor_nb_writer_init(streamer->writer, rsp);
 
 		/* Process the request payload and build the response. */
 		rc = smp_handle_single_req(streamer, &req_hdr, &handler_found, &rsn);
@@ -306,7 +306,7 @@ smp_process_request_packet(struct smp_streamer *streamer, void *vreq)
 		}
 
 		/* Send the response. */
-		rc = streamer->tx_rsp_cb(streamer, rsp, streamer->mgmt_stmr.cb_arg);
+		rc = streamer->tx_rsp_cb(streamer, rsp, streamer->smpt);
 		rsp = NULL;
 		if (rc != 0) {
 			break;
@@ -332,8 +332,8 @@ smp_process_request_packet(struct smp_streamer *streamer, void *vreq)
 		return rc;
 	}
 
-	zephyr_smp_free_buf(req, streamer->mgmt_stmr.cb_arg);
-	zephyr_smp_free_buf(rsp, streamer->mgmt_stmr.cb_arg);
+	zephyr_smp_free_buf(req, streamer->smpt);
+	zephyr_smp_free_buf(rsp, streamer->smpt);
 
 	return rc;
 }

subsys/mgmt/mcumgr/smp.c

@@ -114,11 +114,9 @@ zephyr_smp_process_packet(struct zephyr_smp_transport *zst,
 	int rc;
 
 	streamer = (struct smp_streamer) {
-		.mgmt_stmr = {
-			.reader = &reader,
-			.writer = &writer,
-			.cb_arg = zst,
-		},
+		.reader = &reader,
+		.writer = &writer,
+		.smpt = zst,
 		.tx_rsp_cb = zephyr_smp_tx_rsp,
 	};