espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-06 02:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[radio-spinel] simplify 'Request()' (#5890)

Browse Source 
This commit removes the unused `aWait` parameter from `Request()`
and `RequestV()` methods.
This commit is contained in:
Abtin Keshavarzian
2020-11-30 19:09:46 -08:00
committed by GitHub
parent 0ca10a6538
commit 24bc5c87ad
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/spinel/radio_spinel.hpp
+2 -2
View File
@@ -822,8 +822,8 @@ private:
spinel_tid_t GetNextTid(void);
void FreeTid(spinel_tid_t tid) { mCmdTidsInUse &= ~(1 << tid); }
otError RequestV(bool aWait, uint32_t aCommand, spinel_prop_key_t aKey, const char *aFormat, va_list aArgs);
otError Request(bool aWait, uint32_t aCommand, spinel_prop_key_t aKey, const char *aFormat, ...);
otError RequestV(uint32_t aCommand, spinel_prop_key_t aKey, const char *aFormat, va_list aArgs);
otError Request(uint32_t aCommand, spinel_prop_key_t aKey, const char *aFormat, ...);
otError RequestWithPropertyFormat(const char * aPropertyFormat,
uint32_t aCommand,
spinel_prop_key_t aKey,
src/lib/spinel/radio_spinel_impl.hpp
+9 -11
View File
@@ -1714,16 +1714,15 @@ exit:
}
template <typename InterfaceType, typename ProcessContextType>
otError RadioSpinel<InterfaceType, ProcessContextType>::RequestV(bool aWait,
uint32_t command,
otError RadioSpinel<InterfaceType, ProcessContextType>::RequestV(uint32_t command,
spinel_prop_key_t aKey,
const char * aFormat,
va_list aArgs)
{
otError error = OT_ERROR_NONE;
spinel_tid_t tid = (aWait ? GetNextTid() : 0);
spinel_tid_t tid = GetNextTid();
VerifyOrExit(!aWait || tid > 0, error = OT_ERROR_BUSY);
VerifyOrExit(tid > 0, error = OT_ERROR_BUSY);
error = SendCommand(command, aKey, tid, aFormat, aArgs);
SuccessOrExit(error);
@@ -1735,7 +1734,7 @@ otError RadioSpinel<InterfaceType, ProcessContextType>::RequestV(bool
VerifyOrExit(mTxRadioTid == 0, error = OT_ERROR_BUSY);
mTxRadioTid = tid;
}
else if (aWait)
else
{
mWaitingKey = aKey;
mWaitingTid = tid;
@@ -1747,15 +1746,14 @@ exit:
}
template <typename InterfaceType, typename ProcessContextType>
otError RadioSpinel<InterfaceType, ProcessContextType>::Request(bool aWait,
uint32_t aCommand,
otError RadioSpinel<InterfaceType, ProcessContextType>::Request(uint32_t aCommand,
spinel_prop_key_t aKey,
const char * aFormat,
...)
{
va_list args;
va_start(args, aFormat);
otError status = RequestV(aWait, aCommand, aKey, aFormat, args);
otError status = RequestV(aCommand, aKey, aFormat, args);
va_end(args);
return status;
}
@@ -1787,7 +1785,7 @@ otError RadioSpinel<InterfaceType, ProcessContextType>::RequestWithPropertyForma
otError error;
mPropertyFormat = aPropertyFormat;
error = RequestV(true, aCommand, aKey, aFormat, aArgs);
error = RequestV(aCommand, aKey, aFormat, aArgs);
mPropertyFormat = nullptr;
return error;
@@ -1803,7 +1801,7 @@ otError RadioSpinel<InterfaceType, ProcessContextType>::RequestWithExpectedComma
otError error;
mExpectedCommand = aExpectedCommand;
error = RequestV(true, aCommand, aKey, aFormat, aArgs);
error = RequestV(aCommand, aKey, aFormat, aArgs);
mExpectedCommand = SPINEL_CMD_NOOP;
return error;
@@ -1876,7 +1874,7 @@ otError RadioSpinel<InterfaceType, ProcessContextType>::Transmit(otRadioFrame &a
// `otPlatRadioTxStarted()` is triggered immediately for now, which may be earlier than real started time.
otPlatRadioTxStarted(mInstance, mTransmitFrame);
error = Request(true, SPINEL_CMD_PROP_VALUE_SET, SPINEL_PROP_STREAM_RAW,
error = Request(SPINEL_CMD_PROP_VALUE_SET, SPINEL_PROP_STREAM_RAW,
SPINEL_DATATYPE_DATA_WLEN_S // Frame data
SPINEL_DATATYPE_UINT8_S // Channel
SPINEL_DATATYPE_UINT8_S // MaxCsmaBackoffs