From f807d5cb2941b0d13edbbc3b935dd6999bef1e45 Mon Sep 17 00:00:00 2001 From: Serhii Kostiuk Date: Tue, 16 Jun 2020 15:41:43 +0300 Subject: [GP-654] Add SIM card-based carrier detection Changes after a code review. Renamed "MTS Carrier Code" to the "Carrier Code". --- main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 414a3a8..98a2c23 100644 --- a/main.cpp +++ b/main.cpp @@ -87,7 +87,7 @@ const uint32_t OPT_LOCATION = 0x00010000; const uint32_t OPT_FIRMWAREBUILD = 0x00020000; const uint32_t OPT_SIM_STATUS = 0x00040000; const uint32_t OPT_RADIO_CODE = 0x00080000; -const uint32_t OPT_MTS_SIM_CARRIER = 0x00100000; +const uint32_t OPT_SIM_CARRIER_CODE = 0x00100000; const uint32_t OPT_SUMMARY_STATIC = 0x01000000; const uint32_t OPT_SUMMARY_NETWORK = 0x02000000; @@ -322,9 +322,9 @@ int main(int argc, char** argv) { printf("%s", sValue.c_str()); } } - } else if (g_iOptions & OPT_MTS_SIM_CARRIER) { + } else if (g_iOptions & OPT_SIM_CARRIER_CODE) { std::string sValue; - result = g_apRadio->getMtsSimCarrierCode(sValue); + result = g_apRadio->getSimCarrierCode(sValue); if (result == ICellularRadio::SUCCESS) { printf("%s", sValue.c_str()); } @@ -540,10 +540,10 @@ Json::Value getStaticData() { jData[MTS::IO::ICellularRadio::KEY_SUPPORTED_CELL_MODES] = sSupportedCellModes; std::string sCarrierCode(ICellularRadio::VALUE_UNKNOWN); - if(g_apRadio->getMtsSimCarrierCode(sCarrierCode) != ICellularRadio::SUCCESS) { + if(g_apRadio->getSimCarrierCode(sCarrierCode) != ICellularRadio::SUCCESS) { printWarning("SIM carrier information not found"); } - jData[MTS::IO::ICellularRadio::KEY_MTS_SIM_CARRIER_CODE] = sCarrierCode; + jData[MTS::IO::ICellularRadio::KEY_SIM_CARRIER_CODE] = sCarrierCode; return jData; } @@ -597,7 +597,7 @@ void parseOptions(int argc, char** argv) { { "dynamic", no_argument, &iOption, OPT_SUMMARY_NETWORK }, { "cellular-mode",no_argument, &iOption, OPT_CELL_MODE }, { "supported-cellular-modes", no_argument, &iOption, OPT_SUPPORTED_CELL_MODE }, - { "mts-sim-carrier-code", no_argument, &iOption, OPT_MTS_SIM_CARRIER }, + { "sim-carrier-code", no_argument, &iOption, OPT_SIM_CARRIER_CODE }, { 0, 0, 0, 0 } }; /* getopt_long stores the option index here. */ @@ -706,7 +706,7 @@ void printHelp(const std::string& sApp) { printf("\t--sim-status\n"); printf("\t--cellular-mode\n"); printf("\t--supported-cellular-modes\n"); - printf("\t--mts-sim-carrier-code\n"); + printf("\t--sim-carrier-code\n"); // Applicable for LTE910-NA1 dual FW images only // printf("\t--active-firmware\n"); printf("\n"); -- cgit v1.2.3