diff --git a/src/hostif/handlers/src/hostIf_WiFi_ReqHandler.cpp b/src/hostif/handlers/src/hostIf_WiFi_ReqHandler.cpp index 1b4be8168..e6200bfb3 100644 --- a/src/hostif/handlers/src/hostIf_WiFi_ReqHandler.cpp +++ b/src/hostif/handlers/src/hostIf_WiFi_ReqHandler.cpp @@ -255,9 +255,9 @@ int WiFiReqHandler::handleGetMsg(HOSTIF_MsgData_t *stMsgData) const char *pSetting; const int maxSSID_Instances = 1; int instanceNum = 0; + int radioIndex = 1; #ifdef RDKV_TR69 const int maxRadioInstances = 1; - int radioIndex = 1; if (strcasecmp(stMsgData->paramName,"Device.WiFi.RadioNumberOfEntries") == 0) { stMsgData->instanceNum = maxRadioInstances; @@ -327,6 +327,43 @@ int WiFiReqHandler::handleGetMsg(HOSTIF_MsgData_t *stMsgData) } ret = pIface->get_Device_WiFi_EnableWiFi(stMsgData); } + #ifndef RDKV_TR69 + else if (matchComponent(stMsgData->paramName, "Device.WiFi.Radio", &pSetting, instanceNum)) + { + if (instanceNum != 1) + { + return NOK; + } + + stMsgData->instanceNum = instanceNum; + hostIf_WiFi_Radio *pWifiRadio = hostIf_WiFi_Radio::getInstance(stMsgData->instanceNum); + hostIf_WiFi_Radio_Stats *pWifiRadioStats = hostIf_WiFi_Radio_Stats::getInstance(stMsgData->instanceNum); + + if ((!pWifiRadio) || (!pWifiRadioStats)) + { + return NOK; + } + + if (strcasecmp(pSetting,"OperatingChannelBandwidth") == 0) + { + ret = pWifiRadio->get_Device_WiFi_Radio_OperatingChannelBandwidth(stMsgData,radioIndex); + } + else if (strcasecmp(pSetting,"Stats.PacketsReceived") == 0) + { + ret = pWifiRadioStats->get_Device_WiFi_Radio_Stats_PacketsReceived(stMsgData,radioIndex); + } + else if (strcasecmp(pSetting,"Stats.Noise") == 0) + { + ret = pWifiRadioStats->get_Device_WiFi_Radio_Stats_NoiseFloor(stMsgData,radioIndex); + } + else + { + RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%d] Parameter : \'%s\' is Not Supported \n", __FUNCTION__, __LINE__, stMsgData->paramName); + stMsgData->faultCode = fcInvalidParameterName; + ret = NOK; + } + } + #endif #ifdef RDKV_TR69 else if (matchComponent(stMsgData->paramName, "Device.WiFi.Radio", &pSetting, instanceNum)) { diff --git a/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml b/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml index e41e5a36a..2bc01012a 100755 --- a/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml +++ b/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml @@ -63,6 +63,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/hostif/profiles/wifi/Device_WiFi_Radio.cpp b/src/hostif/profiles/wifi/Device_WiFi_Radio.cpp index affca9375..14b677755 100644 --- a/src/hostif/profiles/wifi/Device_WiFi_Radio.cpp +++ b/src/hostif/profiles/wifi/Device_WiFi_Radio.cpp @@ -155,9 +155,10 @@ hostIf_WiFi_Radio::hostIf_WiFi_Radio(int dev_id): memset(TransmitPowerSupported, 0, sizeof(TransmitPowerSupported)); memset(RegulatoryDomain, 0, sizeof(RegulatoryDomain)); } -#ifdef RDKV_NM + int hostIf_WiFi_Radio::get_Device_WiFi_Radio_Props_Fields(int radioIndex) { +#ifdef RDKV_NM IARM_Result_t retVal = IARM_RESULT_SUCCESS; IARM_BUS_WiFi_DiagsPropParam_t param = {0}; int ret; @@ -208,6 +209,20 @@ int hostIf_WiFi_Radio::get_Device_WiFi_Radio_Props_Fields(int radioIndex) RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s]Error! Unable to connect to wifi instance\n", __FILE__, __FUNCTION__); return NOK; } +#else + hostIf_WiFi_Radio *pDev = hostIf_WiFi_Radio::getInstance(dev_id); + if(pDev) + { + snprintf(OperatingChannelBandwidth,BUFF_MIN_16,"80MHz"); + radioFirstExTime = time (NULL); + return OK; + } + else + { + RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s]Error! Unable to connect to wifi instance\n", __FILE__, __FUNCTION__); + return NOK; + } +#endif } void hostIf_WiFi_Radio::checkWifiRadioFetch(int radioIndex) @@ -224,6 +239,8 @@ void hostIf_WiFi_Radio::checkWifiRadioFetch(int radioIndex) } } +#ifdef RDKV_NM + int hostIf_WiFi_Radio::get_Device_WiFi_Radio_Enable(HOSTIF_MsgData_t *stMsgData,int radioIndex ) { @@ -465,6 +482,8 @@ int hostIf_WiFi_Radio::get_Device_WiFi_Radio_ChannelsInUse(HOSTIF_MsgData_t *stM return OK; } +#endif + int hostIf_WiFi_Radio::get_Device_WiFi_Radio_OperatingChannelBandwidth(HOSTIF_MsgData_t *stMsgData,int radioIndex ) { RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__); @@ -476,6 +495,8 @@ int hostIf_WiFi_Radio::get_Device_WiFi_Radio_OperatingChannelBandwidth(HOSTIF_Ms return OK; } +#ifdef RDKV_NM + int hostIf_WiFi_Radio::get_Device_WiFi_Radio_ExtensionChannel(HOSTIF_MsgData_t *stMsgData,int radioIndex ) { RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__); diff --git a/src/hostif/profiles/wifi/Device_WiFi_Radio.h b/src/hostif/profiles/wifi/Device_WiFi_Radio.h index 348bb690b..340a547a8 100644 --- a/src/hostif/profiles/wifi/Device_WiFi_Radio.h +++ b/src/hostif/profiles/wifi/Device_WiFi_Radio.h @@ -118,10 +118,8 @@ class hostIf_WiFi_Radio { static GList* getAllAssociateDevs(); static void closeInstance(hostIf_WiFi_Radio *); static void closeAllInstances(); - #ifdef RDKV_NM int get_Device_WiFi_Radio_Props_Fields(int radioIndex); void checkWifiRadioFetch(int radioIndex); - #endif bool Enable; char Status[BUFF_LENGTH_64]; char Alias[BUFF_LENGTH_64]; diff --git a/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.cpp b/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.cpp index 5fa032b7f..290a4a005 100644 --- a/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.cpp +++ b/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.cpp @@ -44,9 +44,7 @@ extern "C" { #endif GHashTable* hostIf_WiFi_Radio_Stats::ifHash = NULL; -#ifdef RDKV_NM static time_t radioFirstExTime = 0; -#endif hostIf_WiFi_Radio_Stats *hostIf_WiFi_Radio_Stats::getInstance(int dev_id) { @@ -119,9 +117,9 @@ hostIf_WiFi_Radio_Stats::hostIf_WiFi_Radio_Stats(int dev_id): } -#ifdef RDKV_NM int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_Props_Fields(int radioIndex) { +#ifdef RDKV_NM IARM_Result_t retVal = IARM_RESULT_SUCCESS; IARM_BUS_WiFi_DiagsPropParam_t param = {0}; int ret; @@ -153,6 +151,21 @@ int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_Props_Fields(int radioI RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s]Error! Unable to connect to wifi instance\n", __FILE__, __FUNCTION__); return NOK; } +#else + hostIf_WiFi_Radio_Stats *pDev = hostIf_WiFi_Radio_Stats::getInstance(dev_id); + if(pDev) + { + PacketsReceived = 65568; + NoiseFloor = -100; + radioFirstExTime = time (NULL); + return OK; + } + else + { + RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%s]Error! Unable to connect to wifi instance\n", __FILE__, __FUNCTION__); + return NOK; + } +#endif } @@ -170,6 +183,8 @@ void hostIf_WiFi_Radio_Stats::checkWifiRadioPropsFetch(int radioIndex) } } +#ifdef RDKV_NM + int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_BytesSent(HOSTIF_MsgData_t *stMsgData,int radioIndex ) { RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__); @@ -205,6 +220,8 @@ int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_PacketsSent(HOSTIF_MsgD return OK; } +#endif + int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_PacketsReceived(HOSTIF_MsgData_t *stMsgData,int radioIndex ) { RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__); @@ -216,6 +233,8 @@ int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_PacketsReceived(HOSTIF_ return OK; } +#ifdef RDKV_NM + int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_ErrorsSent(HOSTIF_MsgData_t *stMsgData,int radioIndex ) { RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__); @@ -259,6 +278,9 @@ int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_DiscardPacketsReceived( RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Exiting..\n", __FUNCTION__, __FILE__); return OK; } + +#endif + int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_NoiseFloor(HOSTIF_MsgData_t *stMsgData,int radioIndex ) { RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__); @@ -269,6 +291,5 @@ int hostIf_WiFi_Radio_Stats::get_Device_WiFi_Radio_Stats_NoiseFloor(HOSTIF_MsgDa RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Exiting..\n", __FUNCTION__, __FILE__); return OK; } -#endif #endif /* #ifdef USE_WIFI_PROFILE */ diff --git a/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.h b/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.h index 876286d76..97cdd3c09 100644 --- a/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.h +++ b/src/hostif/profiles/wifi/Device_WiFi_Radio_Stats.h @@ -76,10 +76,8 @@ class hostIf_WiFi_Radio_Stats { static GList* getAllAssociateDevs(); static void closeInstance(hostIf_WiFi_Radio_Stats *); static void closeAllInstances(); - #ifdef RDKV_NM int get_Device_WiFi_Radio_Stats_Props_Fields(int radioIndex); void checkWifiRadioPropsFetch(int radioIndex); - #endif unsigned long BytesSent; unsigned long BytesReceived; @@ -89,7 +87,7 @@ class hostIf_WiFi_Radio_Stats { unsigned int ErrorsReceived; unsigned int DiscardPacketsSent; unsigned int DiscardPacketsReceived; - unsigned int NoiseFloor; + int NoiseFloor; /** * @ingroup TR69_HOSTIF_WIFI_RADIO_STAT diff --git a/src/unittest/stubs/dsVideoDeviceTypes.h b/src/unittest/stubs/dsVideoDeviceTypes.h index ff63232d1..550544ab9 100644 --- a/src/unittest/stubs/dsVideoDeviceTypes.h +++ b/src/unittest/stubs/dsVideoDeviceTypes.h @@ -1,3 +1,4 @@ + /* * If not stated otherwise in this file or this component's LICENSE file the * following copyright and licenses apply: