ULSCH debugging RK.

openair1/PHY/LTE_TRANSPORT/dci.c

@@ -2720,9 +2720,9 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars,
         printf("dci_decoded_output[%d] => %x\n",i,dci_decoded_output[i]);
       */
       crc = (crc16(&dci_decoded_output[subframe&0x1][0],sizeof_bits)>>16) ^ extract_crc(&dci_decoded_output[subframe&0x1][0],sizeof_bits);
-#ifdef DEBUG_DCI_DECODING
-      printf("crc =>%x\n",crc);
-#endif
+      //#ifdef DEBUG_DCI_DECODING
+      LOG_D(PHY,"crc =>%x\n",crc);
+      //#endif
 
       if (((L>1) && ((crc == si_rnti)||
 		     (crc == p_rnti)||

openair2/LAYER2/MAC/eNB_scheduler.c

@@ -504,9 +504,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame
   schedule_SI(module_idP,frameP,subframeP);
   // This schedules Random-Access for legacy LTE and eMTC starting in subframeP
   schedule_RA(module_idP,frameP,subframeP);
-
   // copy previously scheduled UL resources (ULSCH + HARQ)
-
   copy_ulreq(module_idP,frameP,subframeP);
   // This schedules SRS in subframeP
   schedule_SRS(module_idP,frameP,subframeP);

openair2/LAYER2/MAC/eNB_scheduler_primitives.c

@@ -2713,7 +2713,7 @@ int allocate_CCEs(int module_idP,
   int i,j,idci;
   int nCCE=0;
 
-  LOG_D(MAC,"Allocate CCEs subframe %d, test %d : (DL %d,UL %d)\n",subframeP,test_onlyP,DL_req->number_dci,HI_DCI0_req->number_of_dci);
+  LOG_D(MAC,"Allocate CCEs subframe %d, test %d : (DL PDU %d, DL DCI %d, UL %d)\n",subframeP,test_onlyP,DL_req->number_pdu,DL_req->number_dci,HI_DCI0_req->number_of_dci);
   DL_req->number_pdcch_ofdm_symbols=1;
 
 try_again:

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -941,15 +941,13 @@ abort();
 				  format0);
       */
 
-      if (CCE_allocation_infeasible(module_idP,CC_id,0,subframeP,aggregation,rnti)) {
+      if (CCE_allocation_infeasible(module_idP,CC_id,2,subframeP,aggregation,rnti)) {
         LOG_W(MAC,"[eNB %d] frame %d subframe %d, UE %d/%x CC %d: not enough nCCE\n", module_idP,frameP,subframeP,UE_id,rnti,CC_id);
         continue; // break;
-      } else{
-	LOG_D(MAC,"[eNB %d] frame %d subframe %d,Scheduling PUSCH for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n", 
-	      module_idP,frameP,subframeP,UE_id,rnti,CC_id, aggregation,N_RB_UL);
       } 
 
 
+
       //      if (eNB_UE_stats->mode == PUSCH) { // ue has a ulsch channel
 
       UE_template   = &UE_list->UE_template[CC_id][UE_id];
@@ -957,15 +955,8 @@ abort();
       harq_pid      = subframe2harqpid(&cc[CC_id],sched_frame,sched_subframeP);
       round         = UE_sched_ctrl->round_UL[CC_id][harq_pid];
       AssertFatal(round<8,"round %d > 7 for UE %d/%x\n",round,UE_id,rnti);
-      /*      
-      if (get_UL_harq_info(module_idP,CC_id,frameP,subframeP,&harq_pid,&round)<0) {
-	LOG_W(MAC,"[eNB %d] Scheduler Frame %d, subframeP %d: candidate harq_pid from PHY for UE %d CC %d RNTI %x\n",
-	      module_idP,frameP,subframeP, UE_id, CC_id, rnti);
-	continue;
-      } else
-	LOG_T(MAC,"[eNB %d] Frame %d, subframeP %d, UE %d CC %d : got harq pid %d  round %d (rnti %x)\n",
-	      module_idP,frameP,subframeP,UE_id,CC_id, harq_pid, round,rnti);
-      */
+      LOG_D(MAC,"[eNB %d] frame %d subframe %d,Checking PUSCH %d for UE %d/%x CC %d : aggregation level %d, N_RB_UL %d\n", 
+	    module_idP,frameP,subframeP,harq_pid,UE_id,rnti,CC_id, aggregation,N_RB_UL);
 
       RC.eNB[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP*10)+subframeP] = UE_template->ul_total_buffer;
       VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_UE0_BO,RC.eNB[module_idP][CC_id]->pusch_stats_BO[UE_id][(frameP*10)+subframeP]);	
@@ -1108,9 +1099,6 @@ abort();
 	    hi_dci0_pdu->dci_pdu.dci_pdu_rel8.cqi_csi_request                   = cqi_req;
 	    hi_dci0_pdu->dci_pdu.dci_pdu_rel8.dl_assignment_index               = UE_template->DAI_ul[sched_subframeP];
 
-	    if (!CCE_allocation_infeasible(module_idP,CC_id,2,subframeP,
-					   aggregation,
-					   rnti)) {
 	    
 	    eNB->HI_DCI0_req[CC_id].hi_dci0_request_body.number_of_dci++;
 	    
@@ -1153,7 +1141,7 @@ abort();
 	    eNB->ul_handle++;
 	    
 	    
-	    }	
+	  	
 	    add_ue_ulsch_info(module_idP,
 			      CC_id,
 			      UE_id,