Revert "openthread: rpc: support otMessageRegisterTxCallback"

This reverts commit 472e47e.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

doc/nrf/libraries/networking/ot_rpc.rst

@@ -140,7 +140,6 @@ OpenThread RPC currently supports the serialization of the following OpenThread
 * :c:func:`otMessageGetOffset`
 * :c:func:`otMessageGetThreadLinkInfo`
 * :c:func:`otMessageRead`
-* :c:func:`otMessageRegisterTxCallback`
 * :c:func:`otNetDataGet`
 * :c:func:`otNetDataGetNextOnMeshPrefix`
 * :c:func:`otNetDataGetNextService`

samples/nrf_rpc/protocols_serialization/client/src/ot_shell.c

@@ -53,7 +53,6 @@ struct srp_service {
 static bool ot_cli_is_initialized;
 static otUdpSocket udp_socket;
 static const char udp_payload[] = "Hello OpenThread World!";
-static bool udp_tx_callback_enabled;
 static char srp_client_host_name[OT_DNS_MAX_NAME_SIZE];
 static struct srp_service services[SERVICE_NUM];
 
@@ -2022,13 +2021,6 @@ static int cmd_udp_connect(const struct shell *sh, size_t argc, char *argv[])
 	return ot_cli_command_exec(cmd_udp_connect_impl, sh, argc, argv);
 }
 
-static void udp_tx_callback(const otMessage *msg, otError error, void *ctx)
-{
-	struct shell *sh = ctx;
-
-	shell_print(sh, "UDP tx result: %d", error);
-}
-
 static otError cmd_udp_send_impl(const struct shell *sh, size_t argc, char *argv[])
 {
 	otError error;
@@ -2068,10 +2060,6 @@ static otError cmd_udp_send_impl(const struct shell *sh, size_t argc, char *argv
 		return error;
 	}
 
-	if (udp_tx_callback_enabled) {
-		otMessageRegisterTxCallback(msg, udp_tx_callback, (void *)sh);
-	}
-
 	error = otUdpSend(NULL, &udp_socket, msg, &msg_info);
 	if (error != OT_ERROR_NONE) {
 		otMessageFree(msg);
@@ -2095,34 +2083,12 @@ static int cmd_udp_close(const struct shell *sh, size_t argc, char *argv[])
 	return ot_cli_command_exec(cmd_udp_close_impl, sh, argc, argv);
 }
 
-static otError cmd_udp_txcallback_impl(const struct shell *sh, size_t argc, char *argv[])
-{
-	if (argc == 1) {
-		shell_print(sh, "%s", udp_tx_callback_enabled ? "enabled" : "disabled");
-	} else if (strcmp(argv[1], "enable") == 0) {
-		udp_tx_callback_enabled = true;
-	} else if (strcmp(argv[1], "disable") == 0) {
-		udp_tx_callback_enabled = false;
-	} else {
-		return OT_ERROR_INVALID_ARGS;
-	}
-
-	return OT_ERROR_NONE;
-}
-
-static int cmd_udp_txcallback(const struct shell *sh, size_t argc, char *argv[])
-{
-	return ot_cli_command_exec(cmd_udp_txcallback_impl, sh, argc, argv);
-}
-
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	udp_cmds, SHELL_CMD_ARG(open, NULL, "Open socket", cmd_udp_open, 1, 0),
 	SHELL_CMD_ARG(bind, NULL, "Bind socket [-u|-b] <addr> <port>", cmd_udp_bind, 3, 1),
 	SHELL_CMD_ARG(connect, NULL, "Connect socket <addr> <port>", cmd_udp_connect, 3, 0),
 	SHELL_CMD_ARG(send, NULL, "Send message [addr port] <message>", cmd_udp_send, 2, 2),
-	SHELL_CMD_ARG(close, NULL, "Close socket", cmd_udp_close, 1, 0),
-	SHELL_CMD_ARG(txcallback, NULL, "Enable/disable tx callback", cmd_udp_txcallback, 1, 1),
-	SHELL_SUBCMD_SET_END);
+	SHELL_CMD_ARG(close, NULL, "Close socket", cmd_udp_close, 1, 0), SHELL_SUBCMD_SET_END);
 
 static otError cmd_channel_impl(const struct shell *sh, size_t argc, char *argv[])
 {

subsys/net/openthread/rpc/Kconfig

@@ -65,10 +65,6 @@ config OPENTHREAD_RPC_CLIENT_NUM_SENT_COAP_REQUESTS
 	  Defines the number of slots for storing a callback along with its context
 	  for ongoing CoAP requests awaiting a response.
 
-config OPENTHREAD_RPC_CLIENT_NUM_TX_CALLBACKS
-	int "Maximum number of registered message TX callbacks"
-	default 8
-
 config OPENTHREAD_RPC_CLIENT_RADIO_TIME_REFRESH_PERIOD
 	int "Radio time sync period [s]"
 	default 30

subsys/net/openthread/rpc/client/ot_rpc_message.c

@@ -5,11 +5,9 @@
  */
 
 #include <nrf_rpc/nrf_rpc_serialize.h>
-#include <ot_rpc_callback.h>
-#include <ot_rpc_common.h>
 #include <ot_rpc_ids.h>
-#include <ot_rpc_lock.h>
 #include <ot_rpc_types.h>
+#include <ot_rpc_common.h>
 
 #include <nrf_rpc_cbor.h>
 
@@ -18,9 +16,6 @@
 
 #include <string.h>
 
-OT_RPC_CALLBACK_TABLE_DEFINE(tx_cb, otMessageTxCallback,
-			     CONFIG_OPENTHREAD_RPC_CLIENT_NUM_TX_CALLBACKS);
-
 otError otMessageAppend(otMessage *aMessage, const void *aBuf, uint16_t aLength)
 {
 	struct nrf_rpc_cbor_ctx ctx;
@@ -182,59 +177,3 @@ otError otMessageGetThreadLinkInfo(const otMessage *aMessage, otThreadLinkInfo *
 
 	return error;
 }
-
-void otMessageRegisterTxCallback(otMessage *aMessage, otMessageTxCallback aCallback, void *aContext)
-{
-	ot_rpc_res_tab_key key = (ot_rpc_res_tab_key)aMessage;
-	ot_rpc_callback_id cb_id;
-	struct nrf_rpc_cbor_ctx ctx;
-
-	cb_id = ot_rpc_tx_cb_alloc(aCallback, aContext);
-
-	if (aCallback != NULL && cb_id == OT_RPC_CALLBACK_ID_NULL) {
-		/* Failed to allocate a callback entry. */
-		nrf_rpc_err(-ENOMEM, NRF_RPC_ERR_SRC_SEND, &ot_group,
-			    OT_RPC_CMD_MESSAGE_REGISTER_TX_CALLBACK, NRF_RPC_PACKET_TYPE_CMD);
-		return;
-	}
-
-	NRF_RPC_CBOR_ALLOC(&ot_group, ctx, 2 + sizeof(key) + sizeof(cb_id));
-	nrf_rpc_encode_uint(&ctx, key);
-	nrf_rpc_encode_uint(&ctx, cb_id);
-	nrf_rpc_cbor_cmd_no_err(&ot_group, OT_RPC_CMD_MESSAGE_REGISTER_TX_CALLBACK, &ctx,
-				nrf_rpc_rsp_decode_void, NULL);
-}
-
-static void ot_rpc_cmd_message_tx_cb(const struct nrf_rpc_group *group,
-				     struct nrf_rpc_cbor_ctx *ctx, void *handler_data)
-{
-	ot_rpc_callback_id cb_id;
-	ot_rpc_res_tab_key msg_key;
-	otError error;
-	otMessageTxCallback cb;
-	void *context;
-
-	cb_id = nrf_rpc_decode_uint(ctx);
-	msg_key = nrf_rpc_decode_uint(ctx);
-	error = nrf_rpc_decode_uint(ctx);
-
-	if (!nrf_rpc_decoding_done_and_check(group, ctx)) {
-		ot_rpc_report_cmd_decoding_error(OT_RPC_CMD_MESSAGE_TX_CB);
-		return;
-	}
-
-	ot_rpc_mutex_lock();
-
-	cb = ot_rpc_tx_cb_get(cb_id, &context);
-
-	if (cb != NULL) {
-		ot_rpc_tx_cb_free(cb_id);
-		cb((const otMessage *)msg_key, error, context);
-	}
-
-	ot_rpc_mutex_unlock();
-	nrf_rpc_rsp_send_void(group);
-}
-
-NRF_RPC_CBOR_CMD_DECODER(ot_group, ot_rpc_cmd_message_tx_cb, OT_RPC_CMD_MESSAGE_TX_CB,
-			 ot_rpc_cmd_message_tx_cb, NULL);

subsys/net/openthread/rpc/common/CMakeLists.txt

@@ -7,7 +7,6 @@
 zephyr_library()
 
 zephyr_library_sources(
-  ot_rpc_callback.c
   ot_rpc_common.c
   ot_rpc_group.c
 )

subsys/net/openthread/rpc/common/ot_rpc_callback.c

@@ -25,7 +25,6 @@ enum ot_rpc_cmd_client {
 	OT_RPC_CMD_DNS_ADDRESS_RESPONSE_CB,
 	OT_RPC_CMD_DNS_BROWSE_RESPONSE_CB,
 	OT_RPC_CMD_DNS_SERVICE_RESPONSE_CB,
-	OT_RPC_CMD_MESSAGE_TX_CB,
 };
 
 /** @brief Command IDs accepted by the OpenThread over RPC server.
@@ -107,7 +106,6 @@ enum ot_rpc_cmd_server {
 	OT_RPC_CMD_MESSAGE_GET_OFFSET,
 	OT_RPC_CMD_MESSAGE_READ,
 	OT_RPC_CMD_MESSAGE_GET_THREAD_LINK_INFO,
-	OT_RPC_CMD_MESSAGE_REGISTER_TX_CALLBACK,
 	OT_RPC_CMD_UDP_OPEN,
 	OT_RPC_CMD_UDP_IS_OPEN,
 	OT_RPC_CMD_UDP_SEND,

subsys/net/openthread/rpc/common/ot_rpc_callback.h

@@ -5,6 +5,7 @@
  */
 
 #include <nrf_rpc/nrf_rpc_serialize.h>
+#include <nrf_rpc/nrf_rpc_cbkproxy.h>
 #include <ot_rpc_ids.h>
 #include <ot_rpc_types.h>
 #include <ot_rpc_common.h>