maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/demote_another_log_printed_too_many_times' into integration_2024_w13

Browse Source
This commit is contained in:
Jaroslava Fiedlerova
2024-03-29 17:02:16 +01:00
parent 19eb0af185 4ba44927f4
commit 5fc9a4bc42
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/nr/nr_common.c
+19 -12
View File
@@ -536,29 +536,36 @@ int32_t get_delta_duplex(int nr_bandP, uint8_t scs_index)
}
// Returns the corresponding row index of the NR table
int get_nr_table_idx(int nr_bandP, uint8_t scs_index) {
int get_nr_table_idx(int nr_bandP, uint8_t scs_index)
{
int scs_khz = 15 << scs_index;
int supplementary_bands[] = {29,75,76,80,81,82,83,84,86,89,95};
for(int j = 0; j < sizeofArray(supplementary_bands); j++){
if (nr_bandP == supplementary_bands[j])
AssertFatal(0 == 1, "Band %d is a supplementary band (%d). This is not supported yet.\n", nr_bandP, supplementary_bands[j]);
int supplementary_bands[] = {29, 75, 76, 80, 81, 82, 83, 84, 86, 89, 95};
for(int j = 0; j < sizeofArray(supplementary_bands); j++) {
AssertFatal(nr_bandP != supplementary_bands[j],
"Band %d is a supplementary band (%d). This is not supported yet.\n",
nr_bandP,
supplementary_bands[j]);
}
int i;
for (i = 0; i < sizeofArray(nr_bandtable); i++) {
if ( nr_bandtable[i].band == nr_bandP && nr_bandtable[i].deltaf_raster == scs_khz )
if (nr_bandtable[i].band == nr_bandP && nr_bandtable[i].deltaf_raster == scs_khz)
break;
}
if (i == sizeofArray(nr_bandtable)) {
LOG_I(PHY, "not found same deltaf_raster == scs_khz, use only band and last deltaf_raster \n");
for(i=sizeofArray(nr_bandtable)-1; i >=0; i--)
if ( nr_bandtable[i].band == nr_bandP )
LOG_D(PHY, "Not found same deltaf_raster == scs_khz, use only band and last deltaf_raster \n");
for(i = sizeofArray(nr_bandtable) - 1; i >= 0; i--)
if (nr_bandtable[i].band == nr_bandP)
break;
}
AssertFatal(i >= 0 && i < sizeofArray(nr_bandtable), "band is not existing: %d\n",nr_bandP);
LOG_D(PHY, "NR band table index %d (Band %d, dl_min %lu, ul_min %lu)\n", i, nr_bandtable[i].band, nr_bandtable[i].dl_min,nr_bandtable[i].ul_min);
AssertFatal(i >= 0 && i < sizeofArray(nr_bandtable), "band is not existing: %d\n", nr_bandP);
LOG_D(PHY,
"NR band table index %d (Band %d, dl_min %lu, ul_min %lu)\n",
i,
nr_bandtable[i].band,
nr_bandtable[i].dl_min,
nr_bandtable[i].ul_min);
return i;
}