Fixed bugs for MIB/SIBs

openair1/PHY/defs.h

@@ -511,7 +511,8 @@ typedef struct PHY_VARS_eNB_s {
 volatile uint16_t preamble_index_NB_IoT;
 NB_IoT_eNB_NPBCH_t        npbch;
 NB_IoT_eNB_NDLSCH_t       *ndlsch[NUMBER_OF_UE_MAX];
-NB_IoT_eNB_NDLSCH_t       ndlsch_SIB;
+NB_IoT_eNB_NULSCH_t       *nulsch[NUMBER_OF_UE_MAX+1]; //nulsch[0] contains the RAR
+NB_IoT_eNB_NDLSCH_t       ndlsch_SIB,*ndlsch_ra;
 NB_IoT_eNB_NDLSCH_t       ndlsch_rar;
 NB_IoT_eNB_NPDCCH_temp_t  npdcch_tmp;
 

openair1/SCHED/IF_Module_L1_primitives_NB_IoT.h

@@ -13,9 +13,8 @@
 //#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
 
 
-
-void handle_nfapi_dlsch_pdu_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
-						  	   	   eNB_rxtx_proc_NB_IoT_t *proc,
+void handle_nfapi_dlsch_pdu_NB_IoT(PHY_VARS_eNB *eNB,
+						  		   eNB_rxtx_proc_t *proc,
 		       	   	   	           nfapi_dl_config_request_pdu_t *dl_config_pdu,
 						   		   uint8_t *sdu);
 

openair2/RRC/LITE/proto_NB_IoT.h

@@ -39,10 +39,16 @@
 
 uint8_t *get_NB_IoT_MIB(void);
 
+uint8_t *get_NB_IoT_MIB_size(void);
+
 uint8_t *get_NB_IoT_SIB1(void);
 
+uint8_t *get_NB_IoT_SIB1_size(void);
+
 uint8_t *get_NB_IoT_SIB23(void);
 
+uint8_t *get_NB_IoT_SIB23_size(void);
+
 long *get_NB_IoT_SIB1_eutracontrolregionsize(void);
 
 void init_testing_NB_IoT(uint8_t Mod_id, int CC_id, rrc_eNB_carrier_data_NB_IoT_t *carrier, RrcConfigurationReq *configuration, uint32_t frame, uint32_t hyper_frame);

openair2/RRC/LITE/rrc_eNB.c

@@ -125,16 +125,34 @@ uint8_t *get_NB_IoT_MIB(void)
   return eNB_rrc_inst_NB_IoT->carrier[0].MIB_NB_IoT;
 }
 
+
+uint8_t *get_NB_IoT_MIB_size(void)
+{
+  // CC_ID=0
+  return eNB_rrc_inst_NB_IoT->carrier[0].sizeof_MIB_NB_IoT;
+}
+
 uint8_t *get_NB_IoT_SIB1(void)
 {
   return eNB_rrc_inst_NB_IoT->carrier[0].SIB1_NB_IoT;
 }
 
+uint8_t *get_NB_IoT_SIB1_size(void)
+{
+  return eNB_rrc_inst_NB_IoT->carrier[0].sizeof_SIB1_NB_IoT;
+}
+
 uint8_t *get_NB_IoT_SIB23(void)
 {
   return eNB_rrc_inst_NB_IoT->carrier[0].SIB23_NB_IoT;
 }
 
+uint8_t *get_NB_IoT_SIB23_size(void)
+{
+  return eNB_rrc_inst_NB_IoT->carrier[0].sizeof_SIB23_NB_IoT;
+}
+
+
 long *get_NB_IoT_SIB1_eutracontrolregionsize(void)
 {
   return eNB_rrc_inst_NB_IoT->carrier[0].sib1_NB_IoT->eutraControlRegionSize_r13;