creating new file pusch_pc_NB_IoT.c + remouving warning

(143 remaining)

cmake_targets/CMakeLists.txt

@@ -973,6 +973,7 @@ set(SCHED_SRC
   ${OPENAIR1_DIR}/SCHED/IF_Module_L1_primitives_nb_iot.c
   ${OPENAIR1_DIR}/SCHED/pucch_pc.c
   ${OPENAIR1_DIR}/SCHED/pusch_pc.c
+  ${OPENAIR1_DIR}/SCHED/pusch_pc_NB_IoT.c
   ${OPENAIR1_DIR}/SCHED/srs_pc.c
 )
 add_library(SCHED_LIB ${SCHED_SRC})

openair1/SCHED/IF_Module_L1_primitives_nb_iot.c

@@ -176,8 +176,8 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
 
   int i;
 
-  module_id_t                     Mod_id    = Sched_INFO->module_id;
-  uint8_t                         CC_id     = Sched_INFO->CC_id;
+  //module_id_t                     Mod_id    = Sched_INFO->module_id;
+  //uint8_t                         CC_id     = Sched_INFO->CC_id;
   nfapi_dl_config_request_body_t *DL_req    = Sched_INFO->DL_req;
   nfapi_ul_config_request_t 	 *UL_req    = Sched_INFO->UL_req;
   nfapi_hi_dci0_request_body_t *HI_DCI0_req = Sched_INFO->HI_DCI0_req;
@@ -185,14 +185,14 @@ void schedule_response(Sched_Rsp_t *Sched_INFO)
   frame_t                         frame     = Sched_INFO->frame;
   sub_frame_t                     subframe  = Sched_INFO->subframe;
 
-  // implicite declaration of AssertFatal , this function does not exist in OAI code
+  // implicite declaration of AssertFatal
   AsserFatal(proc->subframe_tx != subframe, "Current subframe %d != NFAPI subframe %d\n",proc->subframe_tx,subframe);
   AsserFatal(proc->frame_tx != frame, "Current sframe %d != NFAPI frame %d\n", proc->frame_tx,frame );
 
   uint8_t number_dl_pdu             = DL_req->number_pdu;
   uint8_t number_ul_pdu				= UL_req->ul_config_request_body.number_of_pdus;
   uint8_t number_ul_dci             = HI_DCI0_req->number_of_dci;
-  uint8_t number_pdsch_rnti         = DL_req->number_pdsch_rnti; // for the moment not used
+  //uint8_t number_pdsch_rnti         = DL_req->number_pdsch_rnti; // for the moment not used
 
   // at most 2 pdus (DCI) in the case of NPDCCH
   nfapi_dl_config_request_pdu_t *dl_config_pdu;

openair1/SCHED/defs_nb_iot.h

@@ -28,6 +28,8 @@ void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc
 
 int8_t find_ue_NB_IoT(uint16_t rnti, PHY_VARS_eNB_NB_IoT *eNB);
 
+int16_t get_hundred_times_delta_IF_eNB_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,uint8_t UE_id,uint8_t harq_pid, uint8_t bw_factor);
+
 #endif
 
 

openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c

@@ -277,7 +277,7 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
 			                       eNB->ulsch[i]->harq_processes[harq_pid]->nb_rb>20 ? 1 : 0);
 
           //compute the expected ULSCH RX power (for the stats)
-          eNB->ulsch[(uint32_t)i]->harq_processes[harq_pid]->delta_TF = get_hundred_times_delta_IF_eNB(eNB,i,harq_pid, 0); // 0 means bw_factor is not considered
+          eNB->ulsch[(uint32_t)i]->harq_processes[harq_pid]->delta_TF = get_hundred_times_delta_IF_eNB_NB_IoT(eNB,i,harq_pid, 0); // 0 means bw_factor is not considered
           eNB->UE_stats[i].ulsch_decoding_attempts[harq_pid][eNB->ulsch[i]->harq_processes[harq_pid]->round]++;
           eNB->ulsch[i]->harq_processes[harq_pid]->subframe_scheduling_flag=0;
           if (eNB->ulsch[i]->harq_processes[harq_pid]->cqi_crc_status == 1) 
@@ -360,7 +360,7 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
                      fp->ofdm_symbol_size) -
             eNB->rx_total_gain_dB -
             hundred_times_log10_NPRB[eNB->ulsch[i]->harq_processes[harq_pid]->nb_rb-1]/100 -
-            get_hundred_times_delta_IF_eNB(eNB,i,harq_pid, 0)/100;
+            get_hundred_times_delta_IF_eNB_NB_IoT(eNB,i,harq_pid, 0)/100;
           //for NB-IoT PHICH not work
 	        /*eNB->ulsch[i]->harq_processes[harq_pid]->phich_active = 1;
           eNB->ulsch[i]->harq_processes[harq_pid]->phich_ACK = 1;*/