Improve log and cosmetic changes

openair2/GNB_APP/gnb_config.c

@@ -382,7 +382,7 @@ void prepare_scd(NR_ServingCellConfig_t *scd) {
   scd->defaultDownlinkBWP_Id = CALLOC(1, sizeof(*scd->defaultDownlinkBWP_Id));
   *scd->defaultDownlinkBWP_Id = 0;
 
-for (int j = 0; j < NR_MAX_NUM_BWP; j++) {
+  for (int j = 0; j < NR_MAX_NUM_BWP; j++) {
 
     // Downlink bandwidth part
     NR_BWP_Downlink_t *bwp = calloc(1, sizeof(*bwp));
@@ -459,7 +459,7 @@ for (int j = 0; j < NR_MAX_NUM_BWP; j++) {
     ubwp->bwp_Dedicated->pusch_Config->choice.setup = pusch_Config;
 
     ASN_SEQUENCE_ADD(&scd->uplinkConfig->uplinkBWP_ToAddModList->list,ubwp);
-}
+  }
 }
 
 /* This function checks dedicated serving cell configuration and performs fixes as needed */

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -467,7 +467,7 @@ int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP, rnti_t rnti, NR_S
   const uint16_t sf_ahead = 6/(0x01<<subcarrierSpacing) + ((6%(0x01<<subcarrierSpacing))>0);
   const uint16_t sl_ahead = sf_ahead * (0x01<<subcarrierSpacing);
   sched_ctrl->rrc_processing_timer = (rrc_reconfiguration_delay<<subcarrierSpacing) + sl_ahead;
-  LOG_I(NR_MAC, "Activating RRC processing timer for UE %d\n", UE_id);
+  LOG_I(NR_MAC, "Activating RRC processing timer for UE %d with %d ms\n", UE_id, rrc_reconfiguration_delay);
 
   return 0;
 }

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2642,7 +2642,7 @@ void nr_csirs_scheduling(int Mod_idP,
 
       nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
       NR_BWP_t *genericParameters = sched_ctrl->active_bwp ?
-                                    &sched_ctrl->active_bwp->bwp_Common->genericParameters:
+                                    &sched_ctrl->active_bwp->bwp_Common->genericParameters :
                                     &gNB_mac->common_channels[0].ServingCellConfigCommon->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
       for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
         nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
@@ -2836,15 +2836,15 @@ void nr_mac_update_timers(module_id_t module_id,
         // If needed, update the Dedicated BWP
         const int current_bwp_id = sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0;
         const int current_ubwp_id = sched_ctrl->active_ubwp ? sched_ctrl->active_ubwp->bwp_Id : 0;
-        if(spCellConfigDedicated &&
+        if (spCellConfigDedicated &&
            spCellConfigDedicated->downlinkBWP_ToAddModList &&
            spCellConfigDedicated->uplinkConfig &&
            spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList) {
-          if(*spCellConfigDedicated->firstActiveDownlinkBWP_Id != current_bwp_id) {
+          if (*spCellConfigDedicated->firstActiveDownlinkBWP_Id != current_bwp_id) {
             sched_ctrl->active_bwp = spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[*spCellConfigDedicated->firstActiveDownlinkBWP_Id - 1];
             LOG_I(NR_MAC, "Changing to DL-BWP %li\n", sched_ctrl->active_bwp->bwp_Id);
           }
-          if(*spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id != current_ubwp_id) {
+          if (*spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id != current_ubwp_id) {
             sched_ctrl->active_ubwp = spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.array[*spCellConfigDedicated->uplinkConfig->firstActiveUplinkBWP_Id - 1];
             LOG_I(NR_MAC, "Changing to UL-BWP %li\n", sched_ctrl->active_ubwp->bwp_Id);
           }

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.2x2.usrpn300.conf

@@ -175,7 +175,7 @@ servingCellConfigDedicated = ({
   # BWP-Downlink
     # BWP 1 Configuration
       dl_bwp-Id_1 = 1;
-      dl_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=217 (80 MHz BW)
+      dl_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=273 (100 MHz BW)
       # subcarrierSpacing
       # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
       dl_bwp1_subcarrierSpacing = 1;
@@ -192,7 +192,7 @@ servingCellConfigDedicated = ({
     # BWP-Uplink
       # BWP 1 Configuration
         ul_bwp-Id_1 = 1;
-        ul_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=217 (80 MHz BW)
+        ul_bwp1_locationAndBandwidth = 1099; // RBstart=0, L=273 (100 MHz BW)
         # subcarrierSpacing
         # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         ul_bwp1_subcarrierSpacing = 1;