git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5614 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -4005,7 +4005,6 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
 				      uint8_t eNB_id,
 				      uint8_t use_srs) {
 
-  int subframe_sched = (subframe==9)?0:(subframe+1);
   uint8_t harq_pid;
   uint8_t transmission_mode = phy_vars_ue->transmission_mode[eNB_id];
   ANFBmode_t AckNackFBMode = phy_vars_ue->pucch_config_dedicated[eNB_id].tdd_AckNackFeedbackMode;
@@ -4499,7 +4498,7 @@ int generate_eNB_ulsch_params_from_dci(void *dci_pdu,
   ANFBmode_t AckNackFBMode = phy_vars_eNB->pucch_config_dedicated[UE_id].tdd_AckNackFeedbackMode;
   LTE_eNB_ULSCH_t *ulsch=phy_vars_eNB->ulsch_eNB[UE_id];
   LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->lte_frame_parms;
-  int subframe_sched = (subframe == 9) ? 0 : (subframe+1);
+  int subframe_sched = (subframe == 0) ? 9 : (subframe-1);
 
   uint32_t cqi_req = 0;
   uint32_t dai = 0;

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -1649,14 +1649,14 @@ void phy_procedures_eNB_TX(unsigned char subframe,PHY_VARS_eNB *phy_vars_eNB,uin
 #endif
 
       }
-      /*
-	#ifdef DEBUG_PHY_PROC
-	LOG_D(PHY,"[eNB %d][PUSCH %d] frame %d subframe %d Setting sched_subframeuling_flag for UE %d harq_pid %d (ul subframe %d)\n",
-	phy_vars_eNB->Mod_id,harq_pid,
-	phy_vars_eNB->proc[sched_subframe].frame_tx,subframe,i,harq_pid,
-	pdcch_alloc2ul_subframe(&phy_vars_eNB->lte_frame_parms,subframe));
-	#endif
-      */
+      
+#ifdef DEBUG_PHY_PROC
+      LOG_D(PHY,"[eNB %d][PUSCH %d] frame %d subframe %d Setting subframe_scheduling_flag for UE %d harq_pid %d (ul subframe %d)\n",
+	    phy_vars_eNB->Mod_id,harq_pid,
+	    phy_vars_eNB->proc[sched_subframe].frame_tx,subframe,i,harq_pid,
+	    pdcch_alloc2ul_subframe(&phy_vars_eNB->lte_frame_parms,subframe));
+#endif
+      
       if ((DCI_pdu->dci_alloc[i].rnti  >= CBA_RNTI) && (DCI_pdu->dci_alloc[i].rnti < P_RNTI))
 	phy_vars_eNB->ulsch_eNB[(uint32_t)UE_id]->harq_processes[harq_pid]->subframe_cba_scheduling_flag = 1;
       else 
@@ -2116,7 +2116,7 @@ void process_Msg3(PHY_VARS_eNB *phy_vars_eNB,uint8_t subframe,uint8_t UE_id, uin
     phy_vars_eNB->ulsch_eNB[(uint32_t)UE_id]->Msg3_active = 0;
     phy_vars_eNB->ulsch_eNB[(uint32_t)UE_id]->Msg3_flag = 1;
     phy_vars_eNB->ulsch_eNB[(uint32_t)UE_id]->harq_processes[harq_pid]->subframe_scheduling_flag=1;
-    LOG_D(PHY,"[eNB %d][RAPROC] frame %d, subframe %d: Setting sched_subframeuling_flag (Msg3) for UE %d\n",
+    LOG_D(PHY,"[eNB %d][RAPROC] frame %d, subframe %d: Setting subframe_scheduling_flag (Msg3) for UE %d\n",
 	  phy_vars_eNB->Mod_id,
 	  frame,subframe,UE_id);
   }