X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcommon_def.c;fp=src%2Fcm%2Fcommon_def.c;h=5aa8705e5e4996bf79c4cd694e5f9a4bf9514874;hb=52ca0cf30806914e2f44054932cd2300f12aded8;hp=444db96f8736c31620f6c3fed00403bbdbc57c0d;hpb=fed126358e8ddf1cb94f28740eb668b665685ea9;p=o-du%2Fl2.git diff --git a/src/cm/common_def.c b/src/cm/common_def.c index 444db96f8..5aa8705e5 100644 --- a/src/cm/common_def.c +++ b/src/cm/common_def.c @@ -447,16 +447,16 @@ uint32_t convertArfcnToFreqKhz(uint32_t arfcn) uint8_t indexTable = 0; uint32_t freq = 0; - for(indexTable = 0; indexTable < 4; indexTable++) + for(indexTable = 0; indexTable < 3; indexTable++) { if(arfcn <= arfcnFreqTable[indexTable][4]) { - freq = arfcnFreqTable[indexTable][2] + (arfcnFreqTable[indexTable][1] * (arfcn - arfcnFreqTable[indexTable][3])); - return (freq*1000); + freq = (arfcnFreqTable[indexTable][2] * 1000) + (arfcnFreqTable[indexTable][1] * (arfcn - arfcnFreqTable[indexTable][3])); + return (freq); } } DU_LOG("ERROR --> DUAPP: ARFCN vaid range is between 0 and 3279165"); - return (freq*1000); + return (freq); } @@ -472,7 +472,7 @@ uint32_t convertArfcnToFreqKhz(uint32_t arfcn) * 3GPP TS 38.104, Table 5.4.2.1-1 * Formula: NREF = NREF-Offs + (FREF – FREF-Offs) / ΔFGlobal * -* @params[in] uint32_t Freq(MHZ) +* @params[in] uint32_t Freq(kHZ) * * @return [out] uint32_t ARFCN(number) * @@ -482,11 +482,11 @@ uint32_t convertFreqToArfcn(uint32_t freq) uint8_t indexTable = 0; uint32_t arfcn = 0; - for(indexTable = 0; indexTable < 4; indexTable++) + for(indexTable = 0; indexTable < 3; indexTable++) { if(freq < arfcnFreqTable[indexTable][0]) { - arfcn = arfcnFreqTable[indexTable][3] + ((freq - arfcnFreqTable[indexTable][2]) / (arfcnFreqTable[indexTable][1])); + arfcn = arfcnFreqTable[indexTable][3] + ((freq - (arfcnFreqTable[indexTable][2] * 1000)) / (arfcnFreqTable[indexTable][1])); return (arfcn); } }