espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-21 09:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[style] remove c++11 check and OT_NCP_CONST (#5132)

Browse Source
This commit is contained in:
Yakun Xu
2020-06-20 18:11:12 -07:00
committed by GitHub
parent f79406418a
commit a344fb5969
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ncp/ncp_base_dispatcher.cpp
+20 -22
View File
@@ -35,7 +35,6 @@
namespace ot {
namespace Ncp {
#if __cplusplus >= 201103L
constexpr bool NcpBase::AreHandlerEntriesSorted(const HandlerEntry *aHandlerEntries, size_t aSize)
{
return aSize < 2 ? true
@@ -43,16 +42,14 @@ constexpr bool NcpBase::AreHandlerEntriesSorted(const HandlerEntry *aHandlerEntr
AreHandlerEntriesSorted(aHandlerEntries, aSize - 1));
}
#define OT_NCP_CONST constexpr
#else
#define OT_NCP_CONST const
#endif
NcpBase::PropertyHandler NcpBase::FindGetPropertyHandler(spinel_prop_key_t aKey)
{
#define OT_NCP_GET_HANDLER_ENTRY(aPropertyName) {aPropertyName, &NcpBase::HandlePropertyGet<aPropertyName>}
#define OT_NCP_GET_HANDLER_ENTRY(aPropertyName) \
{ \
aPropertyName, &NcpBase::HandlePropertyGet<aPropertyName> \
}
OT_NCP_CONST static HandlerEntry sHandlerEntries[] = {
constexpr static HandlerEntry sHandlerEntries[] = {
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_LAST_STATUS),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_PROTOCOL_VERSION),
OT_NCP_GET_HANDLER_ENTRY(SPINEL_PROP_NCP_VERSION),
@@ -330,19 +327,20 @@ NcpBase::PropertyHandler NcpBase::FindGetPropertyHandler(spinel_prop_key_t aKey)
#undef OT_NCP_GET_HANDLER_ENTRY
#if __cplusplus >= 201103L
static_assert(AreHandlerEntriesSorted(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries)),
"NCP property getter entries not sorted!");
#endif
return FindPropertyHandler(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries), aKey);
}
NcpBase::PropertyHandler NcpBase::FindSetPropertyHandler(spinel_prop_key_t aKey)
{
#define OT_NCP_SET_HANDLER_ENTRY(aPropertyName) {aPropertyName, &NcpBase::HandlePropertySet<aPropertyName>}
#define OT_NCP_SET_HANDLER_ENTRY(aPropertyName) \
{ \
aPropertyName, &NcpBase::HandlePropertySet<aPropertyName> \
}
OT_NCP_CONST static HandlerEntry sHandlerEntries[] = {
constexpr static HandlerEntry sHandlerEntries[] = {
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_POWER_STATE),
#if OPENTHREAD_CONFIG_NCP_ENABLE_MCU_POWER_STATE_CONTROL
OT_NCP_SET_HANDLER_ENTRY(SPINEL_PROP_MCU_POWER_STATE),
@@ -532,19 +530,20 @@ NcpBase::PropertyHandler NcpBase::FindSetPropertyHandler(spinel_prop_key_t aKey)
#undef OT_NCP_SET_HANDLER_ENTRY
#if __cplusplus >= 201103L
static_assert(AreHandlerEntriesSorted(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries)),
"NCP property setter entries not sorted!");
#endif
return FindPropertyHandler(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries), aKey);
}
NcpBase::PropertyHandler NcpBase::FindInsertPropertyHandler(spinel_prop_key_t aKey)
{
#define OT_NCP_INSERT_HANDLER_ENTRY(aPropertyName) {aPropertyName, &NcpBase::HandlePropertyInsert<aPropertyName>}
#define OT_NCP_INSERT_HANDLER_ENTRY(aPropertyName) \
{ \
aPropertyName, &NcpBase::HandlePropertyInsert<aPropertyName> \
}
OT_NCP_CONST static HandlerEntry sHandlerEntries[] = {
constexpr static HandlerEntry sHandlerEntries[] = {
#if OPENTHREAD_MTD || OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE
OT_NCP_INSERT_HANDLER_ENTRY(SPINEL_PROP_THREAD_ON_MESH_NETS),
@@ -579,19 +578,20 @@ NcpBase::PropertyHandler NcpBase::FindInsertPropertyHandler(spinel_prop_key_t aK
#undef OT_NCP_INSERT_HANDLER_ENTRY
#if __cplusplus >= 201103L
static_assert(AreHandlerEntriesSorted(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries)),
"NCP property setter entries not sorted!");
#endif
return FindPropertyHandler(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries), aKey);
}
NcpBase::PropertyHandler NcpBase::FindRemovePropertyHandler(spinel_prop_key_t aKey)
{
#define OT_NCP_REMOVE_HANDLER_ENTRY(aPropertyName) {aPropertyName, &NcpBase::HandlePropertyRemove<aPropertyName>}
#define OT_NCP_REMOVE_HANDLER_ENTRY(aPropertyName) \
{ \
aPropertyName, &NcpBase::HandlePropertyRemove<aPropertyName> \
}
OT_NCP_CONST static HandlerEntry sHandlerEntries[] = {
constexpr static HandlerEntry sHandlerEntries[] = {
#if OPENTHREAD_MTD || OPENTHREAD_FTD
#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE
OT_NCP_REMOVE_HANDLER_ENTRY(SPINEL_PROP_THREAD_ON_MESH_NETS),
@@ -626,10 +626,8 @@ NcpBase::PropertyHandler NcpBase::FindRemovePropertyHandler(spinel_prop_key_t aK
#undef OT_NCP_REMOVE_HANDLER_ENTRY
#if __cplusplus >= 201103L
static_assert(AreHandlerEntriesSorted(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries)),
"NCP property setter entries not sorted!");
#endif
return FindPropertyHandler(sHandlerEntries, OT_ARRAY_LENGTH(sHandlerEntries), aKey);
}