Added UE measurements report RSRP-RSRQ-CQI

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5234 818b1a75-f10b-46b9-bf7c-635c3b92a50f

Added UE measurements report RSRP-RSRQ-CQI
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5234 818b1a75-f10b-46b9-bf7c-635c3b92a50f
c1f3534f · hrizi · f68c1d82 · c1f3534f
Commit c1f3534f authored Apr 09, 2014 by hrizi
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

openair1/SCHED/phy_procedures_lte_ue.c openair1/SCHED/phy_procedures_lte_ue.c +6 -3

No files found.
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -3230,8 +3230,8 @@ void phy_UE_lte_measurement_thresholds_test_and_report(instance_t instanceP, ral
    MessageDef *message_p = NULL;
    if (
           (
-               ((threshold_phy_pP->threshold.threshold_val <  valP) && (threshold_phy_pP->threshold.threshold_xdir == RAL_ABOVE_THRESHOLD)) ||
-               ((threshold_phy_pP->threshold.threshold_val >  valP) && (threshold_phy_pP->threshold.threshold_xdir == RAL_BELOW_THRESHOLD))
+               (((short) threshold_phy_pP->threshold.threshold_val <  (short) valP) && (threshold_phy_pP->threshold.threshold_xdir == RAL_ABOVE_THRESHOLD)) ||
+               (((short)threshold_phy_pP->threshold.threshold_val >  (short)valP) && (threshold_phy_pP->threshold.threshold_xdir == RAL_BELOW_THRESHOLD))
           )  ||
           (threshold_phy_pP->threshold.threshold_xdir == RAL_NO_THRESHOLD)
       ){
@@ -3288,11 +3288,14 @@ void phy_UE_lte_check_measurement_thresholds(instance_t instanceP, ral_threshold
        case RAL_LINK_PARAM_TYPE_CHOICE_LTE:
            switch (threshold_phy_pP->link_param.link_param_type._union.link_param_gen) {
                case RAL_LINK_PARAM_LTE_UE_RSRP:
-                    phy_UE_lte_measurement_thresholds_test_and_report(instanceP, threshold_phy_pP, PHY_vars_UE_g[mod_id]->PHY_measurements.rx_rssi_dBm[0]);
+//                     phy_UE_lte_measurement_thresholds_test_and_report(instanceP, threshold_phy_pP, PHY_vars_UE_g[mod_id]->PHY_measurements.rx_rssi_dBm[0]);
+                    phy_UE_lte_measurement_thresholds_test_and_report(instanceP, threshold_phy_pP, PHY_vars_UE_g[mod_id]->PHY_measurements.rsrp[0]);
                    break;
                case RAL_LINK_PARAM_LTE_UE_RSRQ:
+                    phy_UE_lte_measurement_thresholds_test_and_report(instanceP, threshold_phy_pP, PHY_vars_UE_g[mod_id]->PHY_measurements.rsrq[0]);
                    break;
                case RAL_LINK_PARAM_LTE_UE_CQI:
+                    phy_UE_lte_measurement_thresholds_test_and_report(instanceP, threshold_phy_pP, PHY_vars_UE_g[mod_id]->PHY_measurements.wideband_cqi_avg[0]);
                    break;
                case RAL_LINK_PARAM_LTE_AVAILABLE_BW:
                    break;