Merge remote-tracking branch 'origin/fix_rsrp_ue' into integration_2025_w41 (!3675)

fix RSRP computation at UE

Conflicts between !3595 (merged) and !3596 (merged) leading to double conversion
of RSRP into index in L1 and L2. With this fix it is only converted in L2.

openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c

@@ -236,11 +236,10 @@ void nr_ue_ssb_rsrp_measurements(PHY_VARS_NR_UE *ue,
     .gNB_index = proc->gNB_id,
     .meas_type = NFAPI_NR_SS_MEAS,
     .Nid_cell = ue->frame_parms.Nid_cell,
+    .rsrp_dBm = ue->measurements.ssb_rsrp_dBm[ssb_index],
     .ssb_index = ssb_index,
     .is_neighboring_cell = false,
   };
-  int ssb_rsrp_dBm = ue->measurements.ssb_rsrp_dBm[ssb_index];
-  l1_measurements.rsrp_dBm = BOUNDED_EVAL(16, ssb_rsrp_dBm + 157, 113); // TS 38.133 - Table 10.1.6.1-1
   nr_downlink_indication_t dl_indication = {0};
   fapi_nr_rx_indication_t rx_ind = {0};
   nr_fill_dl_indication(&dl_indication, NULL, &rx_ind, proc, ue, NULL);

openair1/PHY/NR_UE_TRANSPORT/csi_rx.c

@@ -987,7 +987,7 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue,
     .meas_type = NFAPI_NR_CSI_MEAS,
     .Nid_cell = frame_parms->Nid_cell,
     .is_neighboring_cell = false,
-    .rsrp_dBm = BOUNDED_EVAL(16, rsrp_dBm + 157, 113), // TS 38.133 - Table 10.1.6.1-1
+    .rsrp_dBm = rsrp_dBm,
     .rank_indicator = rank_indicator,
     .i1 = *i1,
     .i2 = *i2,

openair1/SIMULATION/NR_PHY/nr_unitary_common.c

@@ -184,6 +184,6 @@ void nr_mac_rrc_meas_ind_ue(module_id_t module_id,
                             uint16_t Nid_cell,
                             bool csi_meas,
                             bool is_neighboring_cell,
-                            uint8_t rsrp_dBm)
+                            int rsrp_dBm)
 {
 }