more warnings. Note: UE emulator stub is broken after merge.

openair2/LAYER2/MAC/mac_extern.h

@@ -67,7 +67,7 @@ extern int NB_eNB_INST;
 extern int NB_UE_INST;
 extern int NB_THREAD_INST;
 extern int NB_RN_INST;
-extern unsigned short NODE_ID[1];
+extern int NODE_ID[1];
 
 
 extern int cqi_to_mcs[16];

openair2/RRC/LTE/MESSAGES/asn1_msg.c

@@ -98,7 +98,7 @@ typedef struct xer_sprint_string_s {
   size_t string_index;
 } xer_sprint_string_t;
 
-extern unsigned char NB_eNB_INST;
+extern int NB_eNB_INST;
 
 
 extern RAN_CONTEXT_t RC;

openair2/RRC/LTE/rrc_extern.h

@@ -44,16 +44,9 @@ extern LTE_LogicalChannelConfig_t SRB1_logicalChannelConfig_defaultValue;
 extern LTE_LogicalChannelConfig_t SRB2_logicalChannelConfig_defaultValue;
 
 
-#ifndef PHY_EMUL
-#ifndef PHYSIM
-//#define NB_INST 1
-#else
-extern unsigned char NB_INST;
-#endif
-extern unsigned char NB_eNB_INST;
-extern uint16_t NB_UE_INST;
-extern unsigned short NODE_ID[1];
-#endif
+extern int NB_eNB_INST;
+extern int NB_UE_INST;
+extern int NODE_ID[1];
 
 
 //CONSTANTS

targets/RT/USER/lte-ue.c

@@ -1240,10 +1240,11 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
   uint16_t     ue_index = 0;
   uint16_t     ue_num = NB_UE_INST/NB_THREAD_INST+((NB_UE_INST%NB_THREAD_INST > ue_thread_id) ? 1 :0);
   module_id_t ue_Mod_id;
-  PHY_VARS_UE    *UE;   //= rtd->UE;
+  PHY_VARS_UE    *UE = rtd->UE;
   int ret;
   uint8_t   end_flag;
-  proc = &PHY_vars_UE_g[0][0]->proc.proc_rxtx[0];
+  AssertFatal(UE!=NULL,"UE context is null\n");
+  proc = &UE->proc.proc_rxtx[0];
   phy_stub_ticking->num_single_thread[ue_thread_id] = -1;
 
   if(ue_thread_id == 0){