scd_optimization.

(cherry picked from commit 442c24f4e95e531ed258009355d9db238d9c54f5)

openair2/LAYER2/MAC/eNB_scheduler_fairRR.h

@@ -122,6 +122,15 @@ void schedule_ulsch_rnti_fairRR(module_id_t   module_idP,
                          unsigned char sched_subframeP,
                          ULSCH_UE_SELECT  ulsch_ue_select[MAX_NUM_CCs]);
 
+void select_dl_ue_candidate(
+  module_id_t     module_idP,
+  frame_t         frameP,
+  sub_frame_t     subframeP);
+
+void select_ul_ue_candidate(
+  module_id_t     module_idP,
+  frame_t         frameP,
+  sub_frame_t     subframeP);
 
 /* extern */
 extern DLSCH_UE_SELECT dlsch_ue_select[MAX_NUM_CCs];

openair2/LAYER2/MAC/mac_proto.h

@@ -299,6 +299,8 @@ void dlsch_scheduler_pre_processor_allocate(module_id_t Mod_id,
 */
 void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP);	//, int calibration_flag);
 
+void update_ue_timers(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP);
+
 /* \brief Function to indicate a received preamble on PRACH.  It initiates the RA procedure.
 @param Mod_id Instance ID of eNB
 @param preamble_index index of the received RA request

openair2/PHY_INTERFACE/IF_Module.c

@@ -773,8 +773,8 @@ void UL_indication(UL_IND_t *UL_info) {
       sched_info->HI_DCI0_req = &mac->HI_DCI0_req[CC_id][sched_info->subframe];
       
       if (is_UL_sf(&mac->common_channels[CC_id],sched_info->subframe) < 0) {
-        return;
-      }
+        //return;
+      }else{
       if ((mac->common_channels[CC_id].tdd_Config==NULL) ||
           (is_UL_sf(&mac->common_channels[CC_id],sched_info->subframe)>0))
         sched_info->UL_req      = &mac->UL_req[CC_id];
@@ -799,6 +799,9 @@ void UL_indication(UL_IND_t *UL_info) {
         }
         ifi->schedule_response(sched_info);
       }
+      }
+      
+      update_ue_timers(module_id,(UL_info->frame+((UL_info->subframe>(9-sf_ahead-1))?1:0)) % 1024,(UL_info->subframe+sf_ahead+1)%10);
 
       LOG_D(PHY,"Schedule_response: SFN_SF:%d%d dl_pdus:%d\n",sched_info->frame,sched_info->subframe,sched_info->DL_req->dl_config_request_body.number_pdu);
     }