removing of warnings (153 remaining)

openair1/PHY/INIT/lte_init_nb_iot.c

@@ -65,7 +65,7 @@ void NB_phy_config_mib_eNB(
   AssertFatal(PHY_vars_eNB_NB_IoT_g[Mod_id] != NULL, "PHY_vars_eNB_NB_IoT_g instance %d doesn't exist\n",Mod_id);
   AssertFatal(PHY_vars_eNB_NB_IoT_g[Mod_id][CC_id] != NULL, "PHY_vars_eNB_NB_IoT_g instance %d, CCid %d doesn't exist\n",Mod_id,CC_id);
 
-  NB_IoT_DL_FRAME_PARMS *fp = &PHY_vars_eNB_NB_IoT_g[Mod_id][CC_id]->frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS *fp = &PHY_vars_eNB_NB_IoT_g[Mod_id][CC_id]->frame_parms_NB_IoT;
 
    LOG_I(PHY,"Configuring MIB-NB for instance %d, CCid %d : (band %d,Nid_cell %d,p %d,EARFCN %u)\n",
   	  	  Mod_id, CC_id, eutra_band, Nid_cell, p_eNB,EARFCN);

openair1/PHY/LTE_TRANSPORT/pilots_NB_IoT.c

@@ -24,7 +24,7 @@ void generate_pilots_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
 					 unsigned short With_NSSS) 		// With_NSSS = 1; if the frame include a sub-Frame with NSSS signal
 {
 
-  NB_IoT_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->frame_parms;
+  NB_IoT_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->frame_parms_NB_IoT;
 
   uint32_t tti,tti_offset,slot_offset,Nsymb,samples_per_symbol;
   uint8_t first_pilot,second_pilot;

openair1/PHY/defs.h

@@ -703,16 +703,17 @@ typedef struct PHY_VARS_eNB_s {
    */
 
   //TODO: check what should be NUMBER_OF_UE_MAX_NB_IoT value
+  /*
   NB_IoT_eNB_NPBCH_t *npbch;
   NB_IoT_eNB_NPDCCH_t *npdcch[NUMBER_OF_UE_MAX_NB_IoT];
   NB_IoT_eNB_NDLSCH_t *ndlsch[NUMBER_OF_UE_MAX_NB_IoT];
   NB_IoT_eNB_NULSCH_t *nulsch[NUMBER_OF_UE_MAX_NB_IoT+1]; //nulsch[0] contains the RAR
   NB_IoT_eNB_NDLSCH_t *ndlsch_SI,*ndlsch_ra, *ndlsch_SIB1;
 
-  NB_IoT_DL_FRAME_PARMS frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS frame_parms_NB_IoT;
   // DCI for at most 2 DCI pdus
   DCI_PDU_NB *DCI_pdu;
-
+*/
 
 
 } PHY_VARS_eNB;

openair1/PHY/defs_nb_iot.h

@@ -713,7 +713,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
   NB_IoT_eNB_NULSCH_t *nulsch[NUMBER_OF_UE_MAX_NB_IoT+1]; //nulsch[0] contains the RAR
   NB_IoT_eNB_NDLSCH_t *ndlsch_SI,*ndlsch_ra, *ndlsch_SIB1;
 
-  NB_IoT_DL_FRAME_PARMS frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS frame_parms_NB_IoT;
   // DCI for at most 2 DCI pdus
   DCI_PDU_NB *DCI_pdu;
 

openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c

@@ -32,7 +32,7 @@
 
 //#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
-#include "PHY/extern.h" //where we get the global Sched_Rsp_t structure filled
+#include "PHY/extern_NB_IoT.h" //where we get the global Sched_Rsp_t structure filled
 #include "SCHED/defs.h"
 #include "SCHED/extern.h"
 #include "PHY/LTE_TRANSPORT/if4_tools.h"
@@ -105,7 +105,7 @@ extern int rx_sig_fifo;
 */
 void common_signal_procedures_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t *proc) 
 {
-  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_NB_IoT;
   int **txdataF = eNB->common_vars.txdataF[0];
   int subframe = proc->subframe_tx;
   int frame = proc->frame_tx;
@@ -168,7 +168,7 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
   int sync_pos;
   uint16_t rnti=0;
   uint8_t access_mode;
-  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_NB_IoT;
 
   const int subframe = proc->subframe_rx;
   const int frame    = proc->frame_rx;
@@ -184,8 +184,8 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
   T(T_ENB_PHY_UL_TICK, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe));
 
   T(T_ENB_PHY_INPUT_SIGNAL, T_INT(eNB->Mod_id), T_INT(frame), T_INT(subframe), T_INT(0),
-    T_BUFFER(&eNB->common_vars.rxdata[0][0][subframe*eNB->frame_parms_nb_iot.samples_per_tti],
-             eNB->frame_parms_nb_iot.samples_per_tti * 4));
+    T_BUFFER(&eNB->common_vars.rxdata[0][0][subframe*eNB->frame_parms_NB_IoT.samples_per_tti],
+             eNB->frame_parms_NB_IoT.samples_per_tti * 4));
 
   //if ((fp->frame_type == TDD) && (subframe_select(fp,subframe)!=SF_UL)) return;
 
@@ -483,7 +483,7 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
 void generate_eNB_dlsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu) 
 {
   int UE_id = -1;
-  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_NB_IoT;
   int frame = proc->frame_tx;
   int subframe = proc->subframe_tx;
   DCI_CONTENT *DCI_Content; 
@@ -678,7 +678,7 @@ void npdsch_procedures(PHY_VARS_eNB_NB_IoT *eNB,
   int subframe=proc->subframe_tx;
   NB_IoT_DL_eNB_HARQ_t *ndlsch_harq =ndlsch->harq_process;
   int input_buffer_length = ndlsch_harq->TBS/8; // get in byte //the TBS is set in generate_dlsch_param
-  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS *fp=&eNB->frame_parms_NB_IoT;
   int G;
   uint8_t *DLSCH_pdu=NULL;
   uint8_t DLSCH_pdu_tmp[input_buffer_length+4]; //[768*8];
@@ -941,7 +941,7 @@ void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
   int subframe = proc->subframe_tx;
   uint32_t i,aa;
   DCI_PDU_NB *dci_pdu = eNB->DCI_pdu;
-  NB_IoT_DL_FRAME_PARMS *fp = &eNB->frame_parms_nb_iot;
+  NB_IoT_DL_FRAME_PARMS *fp = &eNB->frame_parms_NB_IoT;
   int8_t UE_id = 0;
   uint8_t ul_subframe;
   uint32_t ul_frame;
@@ -1160,7 +1160,7 @@ void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
        */
 
       //this should give only 1 result (since only 1 ndlsch procedure is activated at once) so we brak after the transmission
-      for (int UE_id = 0; i < NUMBER_OF_UE_MAX_NB_IoT; UE_id++)
+      for (int UE_id = 0; UE_id < NUMBER_OF_UE_MAX_NB_IoT; UE_id++)
       {
     	  if(eNB->ndlsch[(uint8_t)UE_id] != NULL && eNB->ndlsch[(uint8_t)UE_id]->active == 1 && (eNB->ndlsch_SIB1->harq_process->status != ACTIVE || subframe != 4)) //condition on sib1-NB
     	  {

targets/RT/USER/lte-softmodem.c

@@ -1589,7 +1589,7 @@ int main( int argc, char **argv ) {
 
       LOG_I(PHY,"Set nb_rx_antenna %d , nb_tx_antenna %d \n",frame_parms[CC_id]->nb_antennas_rx, frame_parms[CC_id]->nb_antennas_tx);
 
-#ifdef NB_IoT
+#ifdef NB_IOT
       frame_parms_nb_iot[CC_id]->nb_antennas_tx     = nb_antenna_tx;
       frame_parms_nb_iot[CC_id]->nb_antennas_rx     = nb_antenna_rx;
       frame_parms_nb_iot[CC_id]->nb_antenna_ports_eNB = 1; //initial value overwritten by initial sync later