From f7ed3b6a0c21a9345a2d1707c77be4212b03c385 Mon Sep 17 00:00:00 2001
From: Maksym Telychko <maksym.telychko@globallogic.com>
Date: Thu, 8 Aug 2019 12:54:39 +0300
Subject: MTX-2891 mpower 2-3-4g: rid of aux options

---
 main.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/main.cpp b/main.cpp
index d65204d..5169d4e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -104,11 +104,10 @@ const uint32_t OPT_MSID                = 0x00800000;
 const uint32_t OPT_SETRXDIVERSITY      = 0x01000000;
 const uint32_t OPT_SETACTIVEFIRMWARE   = 0x02000000;
 const uint32_t OPT_CONFIG_FILE         = 0x04000000;
+const uint32_t OPT_SET_CELLULAR_MODE   = 0x08000000;
 const uint32_t OPT_UNLOCK_SIM_CARD     = 0x20000000;
 const uint32_t OPT_RESET_RADIO         = 0x40000000;
 
-int32_t g_iAuxOptions = 0;
-const uint32_t AOPT_SET_CELLULAR_MODE  = 0x00000001;
 
 void handle_sigterm(int signum);
 void printHelp(const std::string& sApp);
@@ -379,7 +378,7 @@ int main(int argc, char** argv) {
         bool ret = g_apRadio->resetRadio();
         result = (ret) ? ICellularRadio::CODE::SUCCESS : ICellularRadio::CODE::FAILURE;
         printf("%s\n", code2str(result));
-    } else if(g_iAuxOptions & AOPT_SET_CELLULAR_MODE) {
+    } else if(g_iOptions & OPT_SET_CELLULAR_MODE) {
         ICellularRadio::CELLULAR_MODES networks = cellularModeFlags(g_sCellularMode);
         if (networks != ICellularRadio::CELLULAR_MODE_NA) {
             result = g_apRadio->setCellularMode(networks);
@@ -604,7 +603,7 @@ void parseOptions(int argc, char** argv)
             case 'w':
                 if (optarg)
                     g_sCellularMode = optarg;
-                g_iAuxOptions |= AOPT_SET_CELLULAR_MODE;
+                g_iOptions |= OPT_SET_CELLULAR_MODE;
                 break;
 
             default:
-- 
cgit v1.2.3