updated unitary simulations for new CCE interfaces. Cleaned up warnings in dlsim/pdcchsim/ulsim.

openair2/LAYER2/MAC/eNB_scheduler.c

@@ -540,6 +540,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
 
   LOG_D(MAC,"FrameP %d, subframeP %d : Scheduling CCEs\n",frameP,subframeP);
 
+  // Allocate CCEs for good after scheduling is done
   for (CC_id=0;CC_id<MAX_NUM_CCs;CC_id++)
     allocate_CCEs(module_idP,CC_id,subframeP,0);
 

openair2/LAYER2/MAC/eNB_scheduler_dlsch.c

@@ -543,7 +543,6 @@ schedule_ue_spec(
                     UE_list);
         // update UL DAI after DLSCH scheduling
         set_ul_DAI(module_idP,UE_id,CC_id,frameP,subframeP,frame_parms);
-
       }
 
       if (continue_flag == 1 ) {

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -1027,10 +1027,10 @@ int allocate_CCEs(int module_idP,
       }
       else { // number of CCEs left can potentially hold this allocation
 	if ((fCCE = get_nCCE_offset(CCE_table,
-				   1<<(dci_alloc->L), 
-				   nCCE_max,
-				   (i<DCI_pdu->Num_common_dci) ? 1 : 0, 
-				   dci_alloc->rnti, 
+				    1<<(dci_alloc->L), 
+				    nCCE_max,
+				    (i<DCI_pdu->Num_common_dci) ? 1 : 0, 
+				    dci_alloc->rnti, 
 				    subframeP))>=0) {// the allocation is feasible, rnti rule passes
 
 	  LOG_D(MAC,"Allocating at nCCE %d\n",fCCE);

openair2/LAYER2/MAC/pre_processor.c

@@ -762,6 +762,7 @@ void dlsch_scheduler_pre_processor_reset (int module_idP,
   ue_sched_ctl->dl_pow_off[CC_id] = 2;
   nb_rbs_required_remaining[CC_id][UE_id] = 0;
 
+  // Initialize Subbands according to VRB map
   for (i=0; i<N_RBG; i++) {
     ue_sched_ctl->rballoc_sub_UE[CC_id][UE_id] = 0;
     rballoc_sub[CC_id][i] = 0;