[MTX-3998] mPower R. Apr 2021: +CEMODE shall be set to CEMODE=2 - Quectel - GP-1111

Refactoring after review

1 files changed, 26 insertions, 26 deletions

diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp
index 7d96627..b6eab80 100644
--- a/src/MTS_IO_QuectelRadio.cpp
+++ b/src/MTS_IO_QuectelRadio.cpp
@@ -1222,33 +1222,33 @@ ICellularRadio::CODE QuectelRadio::abortFileUpload() {
     return sendBasicCommand(CMD_ABORT_UPLOAD, 2000, 0x00);
 }
 
-ICellularRadio::CODE QuectelRadio::setUeModeOfOperation(UE_MODES_OF_OPERATION mode) {
+ICellularRadio::CODE QuectelRadio::setUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION mode) {
     printTrace("%s| Set UE Mode Of Operation", getName().c_str());
 
     std::string sDomain, sPreference;
 
     switch (mode) {
-        case UE_MODES_OF_OPERATION::CS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1:
             sDomain = "0";
             sPreference = "00";
             break;
-        case UE_MODES_OF_OPERATION::CS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2:
             sDomain = "0";
             sPreference = "01";
             break;
-        case UE_MODES_OF_OPERATION::PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1:
             sDomain = "1";
             sPreference = "00";
             break;
-        case UE_MODES_OF_OPERATION::PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2:
             sDomain = "1";
             sPreference = "01";
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE1:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1:
             sDomain = "2";
             sPreference = "00";
             break;
-        case UE_MODES_OF_OPERATION::CS_PS_MODE2:
+        case ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2:
             sDomain = "2";
             sPreference = "01";
             break;
@@ -1278,7 +1278,7 @@ ICellularRadio::CODE QuectelRadio::setUeModeOfOperation(UE_MODES_OF_OPERATION mo
     return SUCCESS;
 }
 
-ICellularRadio::CODE QuectelRadio::getUeUsageSetting(UE_USAGE_SETTING& us) {
+ICellularRadio::CODE QuectelRadio::getUeUsageSetting(QuectelRadio::UE_USAGE_SETTING& us) {
     printTrace("%s| Get UE Usage Setting", getName().c_str());
 
     std::string sCmd("AT+QNVFR=\"/nv/item_files/modem/mmode/ue_usage_setting\"");
@@ -1309,22 +1309,22 @@ ICellularRadio::CODE QuectelRadio::getUeUsageSetting(UE_USAGE_SETTING& us) {
     return SUCCESS;
 }
 
-ICellularRadio::CODE QuectelRadio::convertToUeUsageSetting(const std::string& sSetting, UE_USAGE_SETTING& us) {
+ICellularRadio::CODE QuectelRadio::convertToUeUsageSetting(const std::string& sSetting, QuectelRadio::UE_USAGE_SETTING& us) {
     if (sSetting == "00") {
-        us = UE_USAGE_SETTING::MODE_1;
+        us = QuectelRadio::UE_USAGE_SETTING::MODE_1;
         return SUCCESS;
     }
 
     if (sSetting == "01") {
-        us = UE_USAGE_SETTING::MODE_2;
+        us = QuectelRadio::UE_USAGE_SETTING::MODE_2;
         return SUCCESS;
     }
 
-    us = UE_USAGE_SETTING::UNKNOWN_MODE;
+    us = QuectelRadio::UE_USAGE_SETTING::UNKNOWN_MODE;
     return FAILURE;
 }
 
-ICellularRadio::CODE QuectelRadio::getUeModeOfOperation(UE_MODES_OF_OPERATION& mode) {
+ICellularRadio::CODE QuectelRadio::getUeModeOfOperation(ICellularRadio::UE_MODES_OF_OPERATION& mode) {
     printTrace("%s| Get UE Mode Of Operation", getName().c_str());
 
     SERVICEDOMAIN sd;
@@ -1342,37 +1342,37 @@ ICellularRadio::CODE QuectelRadio::getUeModeOfOperation(UE_MODES_OF_OPERATION& m
 
     printTrace("%s| Retrieved ue_usage_setting [%d]", getName().c_str(), us);
 
-    if (sd == SERVICEDOMAIN::CS_ONLY && us == UE_USAGE_SETTING::MODE_1) {
-        mode = UE_MODES_OF_OPERATION::CS_MODE1;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_1) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE1;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::CS_ONLY && us == UE_USAGE_SETTING::MODE_2) {
-        mode = UE_MODES_OF_OPERATION::CS_MODE2;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_2) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_MODE2;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::PS_ONLY && us == UE_USAGE_SETTING::MODE_1) {
-        mode = UE_MODES_OF_OPERATION::PS_MODE1;
+    if (sd == ICellularRadio::SERVICEDOMAIN::PS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_1) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE1;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::PS_ONLY && us == UE_USAGE_SETTING::MODE_2) {
-        mode = UE_MODES_OF_OPERATION::PS_MODE2;
+    if (sd == ICellularRadio::SERVICEDOMAIN::PS_ONLY && us == QuectelRadio::UE_USAGE_SETTING::MODE_2) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::PS_MODE2;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::CSPS && us == UE_USAGE_SETTING::MODE_1) {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE1;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CSPS && us == QuectelRadio::UE_USAGE_SETTING::MODE_1) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE1;
         return SUCCESS;
     }
 
-    if (sd == SERVICEDOMAIN::CSPS && us == UE_USAGE_SETTING::MODE_2) {
-        mode = UE_MODES_OF_OPERATION::CS_PS_MODE2;
+    if (sd == ICellularRadio::SERVICEDOMAIN::CSPS && us == QuectelRadio::UE_USAGE_SETTING::MODE_2) {
+        mode = ICellularRadio::UE_MODES_OF_OPERATION::CS_PS_MODE2;
         return SUCCESS;
     }
 
     printError("%s| Unknown combination of servicedomain [%d] and ue_usage_setting [%d]", getName().c_str(), sd, us);
-    mode = UE_MODES_OF_OPERATION::UNKNOWN_MODE;
+    mode = ICellularRadio::UE_MODES_OF_OPERATION::UNKNOWN_MODE;
     return FAILURE;
 }