mgmt/mcumgr: Drop smp_streamer.tx_rsp_cb

No longer needed, since smp_streamer has smpt pointer to
zephyr_smp_transport, it can directly call smpt->zst_output.

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

Author: de-nordic

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

@@ -34,25 +34,13 @@ extern "C" {
 struct smp_streamer;
 struct mgmt_hdr;
 
-/** @typedef smp_tx_rsp_fn
- * @brief Transmits an SMP response packet.
- *
- * @param ss	The streamer to transmit via.
- * @param buf	Buffer containing the response packet.
- * @param arg	Optional streamer argument.
- *
- * @return 0 on success, MGMT_ERR_[...] code on failure.
- */
-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 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

@@ -228,7 +228,7 @@ smp_on_err(struct smp_streamer *streamer, const struct mgmt_hdr *req_hdr,
 	/* 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->smpt);
+		streamer->smpt->zst_output(rsp);
 		rsp = NULL;
 	}
 
@@ -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->smpt);
+		rc = streamer->smpt->zst_output(rsp);
 		rsp = NULL;
 		if (rc != 0) {
 			break;

subsys/mgmt/mcumgr/smp.c

@@ -86,21 +86,6 @@ void zephyr_smp_free_buf(void *buf, void *arg)
 	mcumgr_buf_free(buf);
 }
 
-static int
-zephyr_smp_tx_rsp(struct smp_streamer *ns, void *rsp, void *arg)
-{
-	struct zephyr_smp_transport *zst;
-	struct net_buf *nb;
-
-	zst = arg;
-	nb = rsp;
-
-	/* Pass full packet to output function so it can be transmitted or split into frames as
-	 * needed by the transport
-	 */
-	return zst->zst_output(nb);
-}
-
 /**
  * Processes a single SMP packet and sends the corresponding response(s).
  */
@@ -117,7 +102,6 @@ zephyr_smp_process_packet(struct zephyr_smp_transport *zst,
 		.reader = &reader,
 		.writer = &writer,
 		.smpt = zst,
-		.tx_rsp_cb = zephyr_smp_tx_rsp,
 	};
 
 	rc = smp_process_request_packet(&streamer, nb);