UL without cqi_req for testing

openair1/PHY/LTE_TRANSPORT/dci.c

@@ -2130,11 +2130,11 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
 
       if (dci_alloc[i].L == (uint8_t)L) {
 
-#ifdef DEBUG_DCI_ENCODING
-        LOG_I(PHY,"Generating DCI %d/%d (nCCE %d) of length %d, aggregation %d (%x)\n",i,num_dci,dci_alloc[i].firstCCE,dci_alloc[i].dci_length,dci_alloc[i].L,
+	//#ifdef DEBUG_DCI_ENCODING
+        LOG_D(PHY,"Generating DCI %d/%d (nCCE %d) of length %d, aggregation %d (%x)\n",i,num_dci,dci_alloc[i].firstCCE,dci_alloc[i].dci_length,dci_alloc[i].L,
               *(unsigned int*)dci_alloc[i].dci_pdu);
-        dump_dci(frame_parms,&dci_alloc[i]);
-#endif
+        //dump_dci(frame_parms,&dci_alloc[i]);
+	//#endif
 
         if (dci_alloc[i].firstCCE>=0) {
           e_ptr = generate_dci0(dci_alloc[i].dci_pdu,

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -1390,10 +1390,10 @@ void pusch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
 	      ulsch->Mlimit,
 	      ulsch_harq->o_ACK[0],
 	      ulsch_harq->o_ACK[1]);
-	
+	/*	
 	if (dB_fixed_times10(eNB->pusch_vars[i]->ulsch_power[0]) > 300) {
 	  dump_ulsch(eNB,frame,subframe,i); exit(-1);
-	}
+	  }*/
 
 #if defined(MESSAGE_CHART_GENERATOR_PHY)
 	MSC_LOG_RX_DISCARDED_MESSAGE(

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -935,11 +935,11 @@ abort();
       N_RB_UL      = to_prb(cc[CC_id].ul_Bandwidth);
       eNB_UE_stats = &UE_list->eNB_UE_stats[CC_id][UE_id];
 
-      
+      /*
       aggregation=get_aggregation(get_bw_index(module_idP,CC_id), 
 				  eNB_UE_stats->dl_cqi,
 				  format0);
-      
+      */
 
       if (CCE_allocation_infeasible(module_idP,CC_id,0,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);
@@ -991,6 +991,8 @@ abort();
 	  else
 	    cqi_req = 0;
 	  
+	  cqi_req = 0;
+
           //power control
           //compute the expected ULSCH RX power (for the stats)