Fix: SNR feedback to PUSCH TPC and PUCCH TPC of default scheduler.

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

@@ -1082,7 +1082,7 @@ schedule_ue_spec(module_id_t module_idP,
         // this is the snr
         // unit is not dBm, it's special from nfapi
         // converting to dBm
-        int snr = (5 * ue_sched_ctrl->pucch1_snr[CC_id] - 640) / 10;
+        int snr = ue_sched_ctrl->pucch1_snr[CC_id];
         int target_snr = eNB->puCch10xSnr / 10;
         // this assumes accumulated tpc
         // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out

openair2/LAYER2/MAC/eNB_scheduler_phytest.c

@@ -254,7 +254,7 @@ void schedule_ulsch_phy_test(module_id_t module_idP,frame_t frameP,sub_frame_t s
     //power control
     //compute the expected ULSCH RX power (for the stats)
     // this is the snr and this should be constant (regardless of mcs)
-    snr = (5 * UE_sched_ctrl->pusch_snr[CC_id] - 640) / 10;
+    snr = UE_sched_ctrl->pusch_snr[CC_id];
     // new transmission
     ndi = 1-UE_template->oldNDI_UL[harq_pid];
     UE_template->oldNDI_UL[harq_pid]=ndi;

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -1505,7 +1505,7 @@ schedule_ulsch_rnti(module_id_t   module_idP,
      * This is the normalized RX snr and this should be constant (regardless
      * of mcs) Is not in dBm, unit from nfapi, converting to dBm
      */
-    const int32_t snr = (5 * UE_sched_ctrl_ptr->pusch_snr[CC_id] - 640) / 10;
+    const int32_t snr = UE_sched_ctrl_ptr->pusch_snr[CC_id];
     const int32_t target_snr = mac->puSch10xSnr / 10;
 
     /*
@@ -2100,7 +2100,7 @@ void schedule_ulsch_rnti_emtc(module_id_t   module_idP,
           cqi_req = 0;
           /* Power control: compute the expected ULSCH RX snr (for the stats) */
           /* This is the normalized snr and this should be constant (regardless of mcs) */
-          snr = (5 * UE_sched_ctrl->pusch_snr[CC_id] - 640) / 10;
+          snr = UE_sched_ctrl->pusch_snr[CC_id];
           target_snr = eNB->puSch10xSnr / 10; /* TODO: target_rx_power was 178, what to put? */
           /* This assumes accumulated tpc */
           /* Make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out */