fixes in ssb rsrp functions at ue

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2331,8 +2331,8 @@ uint8_t get_ssb_rsrp_payload(NR_UE_MAC_INST_t *mac,
         temp_payload |= (rsrp_idx<<bits);
         bits += 4; // 7 bits for highest RSRP
       }
+      break; // resorce found
     }
-    break; // resorce found
   }
   pucch->csi_part1_payload = temp_payload;
   return bits;

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1851,7 +1851,8 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
   }
 
   // CSI
-  O_CSI = nr_get_csi_measurements(mac, frameP, slotP, pucch);
+  if (mac->ra.ra_state == RA_SUCCEEDED)
+    O_CSI = nr_get_csi_measurements(mac, frameP, slotP, pucch);
 
   // ACKNACK
   O_ACK = get_downlink_ack(mac, frameP, slotP, pucch);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2077,7 +2077,7 @@ void nr_csirs_scheduling(int Mod_idP,
 
       if((frame*n_slots_frame+slot-offset)%period == 0) {
 
-        LOG_I(MAC,"Scheduling CSI-RS in frame %d slot %d\n",frame,slot);
+        LOG_D(MAC,"Scheduling CSI-RS in frame %d slot %d\n",frame,slot);
 
         nfapi_nr_dl_tti_request_pdu_t *dl_tti_csirs_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
         memset((void*)dl_tti_csirs_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -1204,6 +1204,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  csires1->resourceType = NR_CSI_ResourceConfig__resourceType_periodic;
  ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ResourceConfigToAddModList->list,csires1);
 
+
  csi_MeasConfig->csi_ReportConfigToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_ReportConfigToAddModList));
  csi_MeasConfig->csi_ReportConfigToReleaseList = NULL;
  NR_CSI_ReportConfig_t *csirep1 = calloc(1,sizeof(*csirep1));