From d614d4a08050821f03a5c2f467d9c1fba28ef502 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Wed, 12 Jun 2019 08:36:54 -0700 Subject: [PATCH] [mac] rename methods requesting frame transmission (#3909) --- src/core/api/link_api.cpp | 2 +- src/core/mac/mac.cpp | 4 ++-- src/core/mac/mac.hpp | 4 ++-- src/core/thread/mesh_forwarder.cpp | 2 +- src/core/thread/mesh_forwarder_ftd.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/api/link_api.cpp b/src/core/api/link_api.cpp index cf13e750c..3c5a16590 100644 --- a/src/core/api/link_api.cpp +++ b/src/core/api/link_api.cpp @@ -422,7 +422,7 @@ otError otLinkOutOfBandTransmitRequest(otInstance *aInstance, otRadioFrame *aOob { Instance &instance = *static_cast(aInstance); - return instance.Get().SendOutOfBandFrameRequest(aOobFrame); + return instance.Get().RequestOutOfBandFrameTransmission(aOobFrame); } uint16_t otLinkGetCcaFailureRate(otInstance *aInstance) diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index d4594361f..2417bdbd6 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -478,7 +478,7 @@ exit: return; } -otError Mac::SendFrameRequest(void) +otError Mac::RequestFrameTransmission(void) { otError error = OT_ERROR_NONE; @@ -491,7 +491,7 @@ exit: return error; } -otError Mac::SendOutOfBandFrameRequest(otRadioFrame *aOobFrame) +otError Mac::RequestOutOfBandFrameTransmission(otRadioFrame *aOobFrame) { otError error = OT_ERROR_NONE; diff --git a/src/core/mac/mac.hpp b/src/core/mac/mac.hpp index c545b6ad0..5bcad51af 100644 --- a/src/core/mac/mac.hpp +++ b/src/core/mac/mac.hpp @@ -215,7 +215,7 @@ public: * @retval OT_ERROR_INVALID_STATE The MAC layer is not enabled. * */ - otError SendFrameRequest(void); + otError RequestFrameTransmission(void); /** * This method requests an Out of Band frame for MAC Transmission. @@ -230,7 +230,7 @@ public: * @retval OT_ERROR_INVALID_ARGS The argument @p aOobFrame is NULL. * */ - otError SendOutOfBandFrameRequest(otRadioFrame *aOobFrame); + otError RequestOutOfBandFrameTransmission(otRadioFrame *aOobFrame); /** * This method returns a reference to the IEEE 802.15.4 Extended Address. diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index ccea28d84..9eac97e4e 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -189,7 +189,7 @@ void MeshForwarder::ScheduleTransmissionTask(void) mSendMessageMaxCsmaBackoffs = Mac::kMaxCsmaBackoffsDirect; mSendMessageMaxFrameRetries = Mac::kMaxFrameRetriesDirect; - Get().SendFrameRequest(); + Get().RequestFrameTransmission(); ExitNow(); } diff --git a/src/core/thread/mesh_forwarder_ftd.cpp b/src/core/thread/mesh_forwarder_ftd.cpp index 4f5b7757d..736380489 100644 --- a/src/core/thread/mesh_forwarder_ftd.cpp +++ b/src/core/thread/mesh_forwarder_ftd.cpp @@ -432,7 +432,7 @@ otError MeshForwarder::GetIndirectTransmission(void) mIndirectStartingChild = &child; - Get().SendFrameRequest(); + Get().RequestFrameTransmission(); ExitNow(error = OT_ERROR_NONE); }