Commit a4e2c2b7 authored by francescomani's avatar francescomani

addressing review

parent fb6fa64b
...@@ -344,7 +344,7 @@ void config_common_ue(NR_UE_MAC_INST_t *mac, ...@@ -344,7 +344,7 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
cfg->ssb_table.ssb_offset_point_a = absolute_diff/(12*scs_scaling) - 10; cfg->ssb_table.ssb_offset_point_a = absolute_diff/(12*scs_scaling) - 10;
cfg->ssb_table.ssb_period = *scc->ssb_periodicityServingCell; cfg->ssb_table.ssb_period = *scc->ssb_periodicityServingCell;
// NSA -> take ssb offset from SSC // NSA -> take ssb offset from SCS
cfg->ssb_table.ssb_subcarrier_offset = absolute_diff%(12*scs_scaling); cfg->ssb_table.ssb_subcarrier_offset = absolute_diff%(12*scs_scaling);
switch (scc->ssb_PositionsInBurst->present) { switch (scc->ssb_PositionsInBurst->present) {
......
...@@ -343,14 +343,12 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, int pusch_AntennaPorts, ...@@ -343,14 +343,12 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, int pusch_AntennaPorts,
uint32_t absolute_diff = (*scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB - scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA); uint32_t absolute_diff = (*scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB - scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA);
RC.nrmac[Mod_idP]->ssb_SubcarrierOffset = absolute_diff%(12*scs_scaling); RC.nrmac[Mod_idP]->ssb_SubcarrierOffset = absolute_diff%(12*scs_scaling);
int sco; int sco = 31; // no SIB1
if(get_softmodem_params()->sa) { if(get_softmodem_params()->sa) {
sco = RC.nrmac[Mod_idP]->ssb_SubcarrierOffset; sco = RC.nrmac[Mod_idP]->ssb_SubcarrierOffset;
if(frequency_range == FR1) if(frequency_range == FR1)
sco = sco<<cfg->ssb_config.scs_common.value; sco <<= cfg->ssb_config.scs_common.value; // 38.211 section 7.4.3.1 in FR1 it is expresses in terms of 15kHz SCS
} }
else
sco = 31; // no SIB1
cfg->ssb_table.ssb_offset_point_a.value = absolute_diff/(12*scs_scaling) - 10; //absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total cfg->ssb_table.ssb_offset_point_a.value = absolute_diff/(12*scs_scaling) - 10; //absoluteFrequencySSB is the central frequency of SSB which is made by 20RBs in total
cfg->ssb_table.ssb_offset_point_a.tl.tag = NFAPI_NR_CONFIG_SSB_OFFSET_POINT_A_TAG; cfg->ssb_table.ssb_offset_point_a.tl.tag = NFAPI_NR_CONFIG_SSB_OFFSET_POINT_A_TAG;
......
...@@ -236,7 +236,7 @@ uint8_t do_MIB_NR(gNB_RRC_INST *rrc,uint32_t frame) { ...@@ -236,7 +236,7 @@ uint8_t do_MIB_NR(gNB_RRC_INST *rrc,uint32_t frame) {
if (get_softmodem_params()->sa) { if (get_softmodem_params()->sa) {
ssb_subcarrier_offset = absolute_diff%(12*scs_scaling); ssb_subcarrier_offset = absolute_diff%(12*scs_scaling);
if(frequency_range == FR1) if(frequency_range == FR1)
ssb_subcarrier_offset = ssb_subcarrier_offset<<*scc->ssbSubcarrierSpacing; ssb_subcarrier_offset <<= *scc->ssbSubcarrierSpacing;
} }
mib->message.choice.mib->ssb_SubcarrierOffset = ssb_subcarrier_offset&15; mib->message.choice.mib->ssb_SubcarrierOffset = ssb_subcarrier_offset&15;
......
...@@ -21,9 +21,6 @@ gNBs = ...@@ -21,9 +21,6 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts = 1;
pusch_AntennaPorts = 1;
min_rxtxtime = 6; min_rxtxtime = 6;
servingCellConfigCommon = ( servingCellConfigCommon = (
......
...@@ -32,10 +32,9 @@ gNBs = ...@@ -32,10 +32,9 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
ssb_SubcarrierOffset = 0; pdsch_AntennaPorts_XP = 2;
pdsch_AntennaPorts = 4; pdsch_AntennaPorts_N1 = 2;
pusch_AntennaPorts = 4; pusch_AntennaPorts = 4;
sib1_tda = 0;
pdcch_ConfigSIB1 = ( pdcch_ConfigSIB1 = (
{ {
...@@ -73,15 +72,6 @@ gNBs = ...@@ -73,15 +72,6 @@ gNBs =
#pdcch-ConfigCommon #pdcch-ConfigCommon
initialDLBWPcontrolResourceSetZero = 12; initialDLBWPcontrolResourceSetZero = 12;
initialDLBWPsearchSpaceZero = 0; initialDLBWPsearchSpaceZero = 0;
#pdsch-ConfigCommon
#pdschTimeDomainAllocationList (up to 16 entries)
initialDLBWPk0_0 = 0; #for DL slot
initialDLBWPmappingType_0 = 0; #0=typeA,1=typeB
initialDLBWPstartSymbolAndLength_0 = 40; #this is SS=1,L=13
initialDLBWPk0_1 = 0; #for mixed slot
initialDLBWPmappingType_1 = 0;
initialDLBWPstartSymbolAndLength_1 = 57; #this is SS=1,L=5
#uplinkConfigCommon #uplinkConfigCommon
#frequencyInfoUL #frequencyInfoUL
...@@ -136,19 +126,6 @@ gNBs = ...@@ -136,19 +126,6 @@ gNBs =
# 0=unrestricted, 1=restricted type A, 2=restricted type B # 0=unrestricted, 1=restricted type A, 2=restricted type B
restrictedSetConfig = 0, restrictedSetConfig = 0,
# pusch-ConfigCommon (up to 16 elements)
initialULBWPk2_0 = 6; # used for UL slot
initialULBWPmappingType_0 = 1
initialULBWPstartSymbolAndLength_0 = 41; # this is SS=0 L=13
initialULBWPk2_1 = 6; # used for mixed slot
initialULBWPmappingType_1 = 1;
initialULBWPstartSymbolAndLength_1 = 52; # this is SS=10 L=4
initialULBWPk2_2 = 7; # used for Msg.3 during RA
initialULBWPmappingType_2 = 1;
initialULBWPstartSymbolAndLength_2 = 52; # this is SS=10 L=4
msg3_DeltaPreamble = 1; msg3_DeltaPreamble = 1;
p0_NominalWithGrant =-90; p0_NominalWithGrant =-90;
......
...@@ -27,7 +27,6 @@ gNBs = ...@@ -27,7 +27,6 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts_XP = 1; pdsch_AntennaPorts_XP = 1;
pusch_AntennaPorts = 2; pusch_AntennaPorts = 2;
do_CSIRS = 0; do_CSIRS = 0;
...@@ -318,4 +317,4 @@ log_config : ...@@ -318,4 +317,4 @@ log_config :
rrc_log_level ="info"; rrc_log_level ="info";
ngap_log_level ="debug"; ngap_log_level ="debug";
f1ap_log_level ="debug"; f1ap_log_level ="debug";
}; };
\ No newline at end of file
...@@ -27,7 +27,6 @@ gNBs = ...@@ -27,7 +27,6 @@ gNBs =
////////// Physical parameters: ////////// Physical parameters:
ssb_SubcarrierOffset = 0;
pdsch_AntennaPorts_XP = 1; pdsch_AntennaPorts_XP = 1;
pusch_AntennaPorts = 2; pusch_AntennaPorts = 2;
do_CSIRS = 0; do_CSIRS = 0;
...@@ -318,4 +317,4 @@ log_config : ...@@ -318,4 +317,4 @@ log_config :
rrc_log_level ="info"; rrc_log_level ="info";
ngap_log_level ="debug"; ngap_log_level ="debug";
f1ap_log_level ="debug"; f1ap_log_level ="debug";
}; };
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment