mgmt/mcumgr: Drop zephyr_ prefix from functions

The MCUMgr library is now part of Zephyr, so there is no point
to prefix SMP functions with Zephyr.

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

Author: de-nordic

include/zephyr/mgmt/mcumgr/smp.h

@@ -13,22 +13,25 @@
 extern "C" {
 #endif
 
+struct smp_transport;
 struct zephyr_smp_transport;
 struct net_buf;
 
-/** @typedef zephyr_smp_transport_out_fn
- * @brief SMP transmit function for Zephyr.
+/** @typedef smp_transport_out_fn
+ * @brief SMP transmit callback for transport
  *
  * The supplied net_buf is always consumed, regardless of return code.
  *
  * @param nb                    The net_buf to transmit.
  *
  * @return                      0 on success, MGMT_ERR_[...] code on failure.
  */
+typedef int (*smp_transport_out_fn)(struct net_buf *nb);
+/* use smp_transport_out_fn instead */
 typedef int zephyr_smp_transport_out_fn(struct net_buf *nb);
 
-/** @typedef zephyr_smp_transport_get_mtu_fn
- * @brief SMP MTU query function for Zephyr.
+/** @typedef smp_transport_get_mtu_fn
+ * @brief SMP MTU query callback for transport
  *
  * The supplied net_buf should contain a request received from the peer whose
  * MTU is being queried.  This function takes a net_buf parameter because some
@@ -40,10 +43,12 @@ typedef int zephyr_smp_transport_out_fn(struct net_buf *nb);
  * @return                      The transport's MTU;
  *                              0 if transmission is currently not possible.
  */
+typedef uint16_t (*smp_transport_get_mtu_fn)(const struct net_buf *nb);
+/* use smp_transport_get_mtu_fn instead */
 typedef uint16_t zephyr_smp_transport_get_mtu_fn(const struct net_buf *nb);
 
-/** @typedef zephyr_smp_transport_ud_copy_fn
- * @brief SMP copy buffer user_data function for Zephyr.
+/** @typedef smp_transport_ud_copy_fn
+ * @brief SMP copy user_data callback
  *
  * The supplied src net_buf should contain a user_data that cannot be copied
  * using regular memcpy function (e.g., the BLE transport net_buf user_data
@@ -55,34 +60,61 @@ typedef uint16_t zephyr_smp_transport_get_mtu_fn(const struct net_buf *nb);
  *
  * @return                      0 on success, MGMT_ERR_[...] code on failure.
  */
+typedef int (*smp_transport_ud_copy_fn)(struct net_buf *dst,
+					const struct net_buf *src);
+/* use smp_transport_ud_copy_fn instead */
 typedef int zephyr_smp_transport_ud_copy_fn(struct net_buf *dst,
 					    const struct net_buf *src);
 
-/** @typedef zephyr_smp_transport_ud_free_fn
- * @brief SMP free buffer user_data function for Zephyr.
+/** @typedef smp_transport_ud_free_fn
+ * @brief SMP free user_data callback
  *
  * This function frees net_buf user data, because some transports store
  * connection-specific information in the net_buf user data (e.g., the BLE
  * transport stores the connection reference that has to be decreased).
  *
  * @param ud                    Contains a user_data pointer to be freed.
  */
+typedef void (*smp_transport_ud_free_fn)(void *ud);
+/* use smp_transport_ud_free_fn instead */
 typedef void zephyr_smp_transport_ud_free_fn(void *ud);
 
 /**
- * @brief Provides Zephyr-specific functionality for sending SMP responses.
+ * @brief SMP transport object for sending SMP responses.
  */
+struct smp_transport {
+	/* Must be the first member. */
+	struct k_work zst_work;
+
+	/* FIFO containing incoming requests to be processed. */
+	struct k_fifo zst_fifo;
+
+	smp_transport_out_fn zst_output;
+	smp_transport_get_mtu_fn zst_get_mtu;
+	smp_transport_ud_copy_fn zst_ud_copy;
+	smp_transport_ud_free_fn zst_ud_free;
+
+#ifdef CONFIG_MCUMGR_SMP_REASSEMBLY
+	/* Packet reassembly internal data, API access only */
+	struct {
+		struct net_buf *current;	/* net_buf used for reassembly */
+		uint16_t expected;		/* expected bytes to come */
+	} __reassembly;
+#endif
+};
+
+/* Deprecated, use smp_transport instead */
 struct zephyr_smp_transport {
 	/* Must be the first member. */
 	struct k_work zst_work;
 
 	/* FIFO containing incoming requests to be processed. */
 	struct k_fifo zst_fifo;
 
-	zephyr_smp_transport_out_fn *zst_output;
-	zephyr_smp_transport_get_mtu_fn *zst_get_mtu;
-	zephyr_smp_transport_ud_copy_fn *zst_ud_copy;
-	zephyr_smp_transport_ud_free_fn *zst_ud_free;
+	smp_transport_out_fn zst_output;
+	smp_transport_get_mtu_fn zst_get_mtu;
+	smp_transport_ud_copy_fn zst_ud_copy;
+	smp_transport_ud_free_fn zst_ud_free;
 
 #ifdef CONFIG_MCUMGR_SMP_REASSEMBLY
 	/* Packet reassembly internal data, API access only */
@@ -102,11 +134,25 @@ struct zephyr_smp_transport {
  * @param ud_copy_func          The transport buffer user_data copy function.
  * @param ud_free_func          The transport buffer user_data free function.
  */
-void zephyr_smp_transport_init(struct zephyr_smp_transport *zst,
+void smp_transport_init(struct smp_transport *zst,
+			smp_transport_out_fn output_func,
+			smp_transport_get_mtu_fn get_mtu_func,
+			smp_transport_ud_copy_fn ud_copy_func,
+			smp_transport_ud_free_fn ud_free_func);
+
+static inline
+void zephyr_smp_transport_init(struct zephyr_smp_transport *smpt,
 			       zephyr_smp_transport_out_fn *output_func,
 			       zephyr_smp_transport_get_mtu_fn *get_mtu_func,
 			       zephyr_smp_transport_ud_copy_fn *ud_copy_func,
-			       zephyr_smp_transport_ud_free_fn *ud_free_func);
+			       zephyr_smp_transport_ud_free_fn *ud_free_func)
+{
+	smp_transport_init((struct smp_transport *)smpt,
+			   (smp_transport_out_fn)output_func,
+			   (smp_transport_get_mtu_fn)get_mtu_func,
+			   (smp_transport_ud_copy_fn)ud_copy_func,
+			   (smp_transport_ud_free_fn)ud_free_func);
+}
 
 #ifdef __cplusplus
 }

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

@@ -38,7 +38,7 @@ struct mgmt_hdr;
  * @brief Decodes, encodes, and transmits SMP packets.
  */
 struct smp_streamer {
-	struct zephyr_smp_transport *smpt;
+	struct smp_transport *smpt;
 	struct cbor_nb_reader *reader;
 	struct cbor_nb_writer *writer;
 };

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

@@ -233,8 +233,8 @@ smp_on_err(struct smp_streamer *streamer, const struct mgmt_hdr *req_hdr,
 	}
 
 	/* Free any extra buffers. */
-	zephyr_smp_free_buf(req, streamer->smpt);
-	zephyr_smp_free_buf(rsp, streamer->smpt);
+	smp_free_buf(req, streamer->smpt);
+	smp_free_buf(rsp, streamer->smpt);
 }
 
 /**
@@ -290,7 +290,7 @@ smp_process_request_packet(struct smp_streamer *streamer, void *vreq)
 			break;
 		}
 
-		rsp = zephyr_smp_alloc_rsp(req, streamer->smpt);
+		rsp = smp_alloc_rsp(req, streamer->smpt);
 		if (rsp == NULL) {
 			rc = MGMT_ERR_ENOMEM;
 			break;
@@ -332,8 +332,8 @@ smp_process_request_packet(struct smp_streamer *streamer, void *vreq)
 		return rc;
 	}
 
-	zephyr_smp_free_buf(req, streamer->smpt);
-	zephyr_smp_free_buf(rsp, streamer->smpt);
+	smp_free_buf(req, streamer->smpt);
+	smp_free_buf(rsp, streamer->smpt);
 
 	return rc;
 }

subsys/mgmt/mcumgr/smp.c

@@ -45,11 +45,11 @@ static const struct k_work_queue_config smp_work_queue_config = {
  * @return	Newly-allocated buffer on success
  *		NULL on failure.
  */
-void *zephyr_smp_alloc_rsp(const void *req, void *arg)
+void *smp_alloc_rsp(const void *req, void *arg)
 {
 	const struct net_buf *req_nb;
 	struct net_buf *rsp_nb;
-	struct zephyr_smp_transport *zst = arg;
+	struct smp_transport *zst = arg;
 
 	req_nb = req;
 
@@ -69,9 +69,9 @@ void *zephyr_smp_alloc_rsp(const void *req, void *arg)
 	return rsp_nb;
 }
 
-void zephyr_smp_free_buf(void *buf, void *arg)
+void smp_free_buf(void *buf, void *arg)
 {
-	struct zephyr_smp_transport *zst = arg;
+	struct smp_transport *zst = arg;
 
 	if (!buf) {
 		return;
@@ -88,7 +88,7 @@ void zephyr_smp_free_buf(void *buf, void *arg)
  * Processes a single SMP packet and sends the corresponding response(s).
  */
 static int
-zephyr_smp_process_packet(struct zephyr_smp_transport *zst,
+smp_process_packet(struct smp_transport *zst,
 			  struct net_buf *nb)
 {
 	struct cbor_nb_reader reader;
@@ -110,37 +110,37 @@ zephyr_smp_process_packet(struct zephyr_smp_transport *zst,
  * Processes all received SNP request packets.
  */
 static void
-zephyr_smp_handle_reqs(struct k_work *work)
+smp_handle_reqs(struct k_work *work)
 {
-	struct zephyr_smp_transport *zst;
+	struct smp_transport *zst;
 	struct net_buf *nb;
 
 	zst = (void *)work;
 
 	while ((nb = net_buf_get(&zst->zst_fifo, K_NO_WAIT)) != NULL) {
-		zephyr_smp_process_packet(zst, nb);
+		smp_process_packet(zst, nb);
 	}
 }
 
 void
-zephyr_smp_transport_init(struct zephyr_smp_transport *zst,
-			  zephyr_smp_transport_out_fn *output_func,
-			  zephyr_smp_transport_get_mtu_fn *get_mtu_func,
-			  zephyr_smp_transport_ud_copy_fn *ud_copy_func,
-			  zephyr_smp_transport_ud_free_fn *ud_free_func)
+smp_transport_init(struct smp_transport *zst,
+		   smp_transport_out_fn output_func,
+		   smp_transport_get_mtu_fn get_mtu_func,
+		   smp_transport_ud_copy_fn ud_copy_func,
+		   smp_transport_ud_free_fn ud_free_func)
 {
-	*zst = (struct zephyr_smp_transport) {
+	*zst = (struct smp_transport) {
 		.zst_output = output_func,
 		.zst_get_mtu = get_mtu_func,
 		.zst_ud_copy = ud_copy_func,
 		.zst_ud_free = ud_free_func,
 	};
 
 #ifdef CONFIG_MCUMGR_SMP_REASSEMBLY
-	zephyr_smp_reassembly_init(zst);
+	smp_reassembly_init(zst);
 #endif
 
-	k_work_init(&zst->zst_work, zephyr_smp_handle_reqs);
+	k_work_init(&zst->zst_work, smp_handle_reqs);
 	k_fifo_init(&zst->zst_fifo);
 }
 
@@ -154,13 +154,13 @@ zephyr_smp_transport_init(struct zephyr_smp_transport *zst,
  * @param nb                    The request packet to process.
  */
 WEAK void
-zephyr_smp_rx_req(struct zephyr_smp_transport *zst, struct net_buf *nb)
+smp_rx_req(struct smp_transport *zst, struct net_buf *nb)
 {
 	net_buf_put(&zst->zst_fifo, nb);
 	k_work_submit_to_queue(&smp_work_queue, &zst->zst_work);
 }
 
-static int zephyr_smp_init(const struct device *dev)
+static int smp_init(const struct device *dev)
 {
 	k_work_queue_init(&smp_work_queue);
 
@@ -171,4 +171,4 @@ static int zephyr_smp_init(const struct device *dev)
 	return 0;
 }
 
-SYS_INIT(zephyr_smp_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
+SYS_INIT(smp_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);

subsys/mgmt/mcumgr/smp_internal.h

@@ -12,6 +12,7 @@
 extern "C" {
 #endif
 
+struct smp_transport;
 struct zephyr_smp_transport;
 struct net_buf;
 
@@ -24,7 +25,13 @@ struct net_buf;
  *                                  response(s).
  * @param nb                    The request packet to process.
  */
-void zephyr_smp_rx_req(struct zephyr_smp_transport *zst, struct net_buf *nb);
+void smp_rx_req(struct smp_transport *zst, struct net_buf *nb);
+
+static inline
+void zephyr_smp_rx_req(struct zephyr_smp_transport *smpt, struct net_buf *nb)
+{
+	smp_rx_req((struct smp_transport *)smpt, nb);
+}
 
 /**
  * @brief Allocates a response buffer.
@@ -37,15 +44,28 @@ void zephyr_smp_rx_req(struct zephyr_smp_transport *zst, struct net_buf *nb);
  * @return	Newly-allocated buffer on success
  *		NULL on failure.
  */
-void *zephyr_smp_alloc_rsp(const void *req, void *arg);
+void *smp_alloc_rsp(const void *req, void *arg);
+
+static inline
+void *zephyr_smp_alloc_rsp(const void *req, void *arg)
+{
+	return smp_alloc_rsp(req, arg);
+}
+
 
 /**
  * @brief Frees an allocated buffer.
  *
  * @param buf		The buffer to free.
  * @param arg		The streamer providing the callback.
  */
-void zephyr_smp_free_buf(void *buf, void *arg);
+void smp_free_buf(void *buf, void *arg);
+
+static inline
+void zephyr_smp_free_buf(void *buf, void *arg)
+{
+	smp_free_buf(buf, arg);
+}
 
 #ifdef __cplusplus
 }