Merge branch '421-cdrx-for-lte' into orange_cdrx_test

doc/FEATURE_SET.md

@@ -72,6 +72,7 @@ The MAC layer implements a subset of the **3GPP 36.321** release v8.6 in support
 - RLC interface (AM, UM)
 - UL power control
 - Link adaptation
+- Connected DRX (CDRX) support for FDD LTE UE. Compatible with R13 from 3GPP. Support for Cat-M1 UE comming soon.  
 
 ## eNB RLC Layer ##
 

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -1503,7 +1503,7 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
   int subframe_tx;
   int frame_tx;
   UE_sched_ctrl *UE_scheduling_control = NULL;
-  UE_list_t *UE_list = NULL
+  UE_list_t *UE_list = NULL;
 
   AssertFatal(UE_id != -1, "No existing dlsch context\n");
   AssertFatal(UE_id < NUMBER_OF_UE_MAX, "Returned UE_id %d >= %d (NUMBER_OF_UE_MAX)\n", UE_id, NUMBER_OF_UE_MAX);

openair2/PHY_INTERFACE/IF_Module.c

@@ -114,26 +114,25 @@ void handle_cqi(UL_IND_t *UL_info) {
 }
 
 void handle_harq(UL_IND_t *UL_info) {
-  int i;
-
-  if (NFAPI_MODE == NFAPI_MODE_PNF && UL_info->harq_ind.harq_indication_body.number_of_harqs>0) { // PNF
+  if (NFAPI_MODE == NFAPI_MODE_PNF && UL_info->harq_ind.harq_indication_body.number_of_harqs > 0) { // PNF
     //LOG_D(PHY, "UL_info->harq_ind.harq_indication_body.number_of_harqs:%d Send to VNF\n", UL_info->harq_ind.harq_indication_body.number_of_harqs);
     int retval = oai_nfapi_harq_indication(&UL_info->harq_ind);
 
-    if (retval!=0) {
+    if (retval != 0) {
       LOG_E(PHY, "Failed to encode NFAPI HARQ_IND retval:%d\n", retval);
     }
 
     UL_info->harq_ind.harq_indication_body.number_of_harqs = 0;
+
   } else {
-    for (i=0; i<UL_info->harq_ind.harq_indication_body.number_of_harqs; i++)
+    for (int i=0; i < UL_info->harq_ind.harq_indication_body.number_of_harqs; i++)
       harq_indication(UL_info->module_id,
                       UL_info->CC_id,
                       NFAPI_SFNSF2SFN(UL_info->harq_ind.sfn_sf),
                       NFAPI_SFNSF2SF(UL_info->harq_ind.sfn_sf),
                       &UL_info->harq_ind.harq_indication_body.harq_pdu_list[i]);
 
-    UL_info->harq_ind.harq_indication_body.number_of_harqs=0;
+    UL_info->harq_ind.harq_indication_body.number_of_harqs = 0;
   }
 }