Still working on ASN.1

openair2/LAYER2/MAC/config_NB_IoT.c

@@ -292,7 +292,7 @@ void rrc_mac_config_req_NB_IoT(
     int                                     CC_idP,
     int                                     rntiP,
     rrc_eNB_carrier_data_NB_IoT_t           *carrier,
-    LTE_LTE_SystemInformationBlockType1_NB_t        *sib1_NB_IoT,
+    LTE_SystemInformationBlockType1_NB_t        *sib1_NB_IoT,
     LTE_RadioResourceConfigCommonSIB_NB_r13_t   *radioResourceConfigCommon,
     LTE_PhysicalConfigDedicated_NB_r13_t        *physicalConfigDedicated,
     LTE_LogicalChannelConfig_NB_r13_t           *logicalChannelConfig,  
@@ -390,7 +390,7 @@ void rrc_mac_config_req_NB_IoT(
     if (radioResourceConfigCommon!=NULL)
     {
       //LOG_I(MAC,"[CONFIG]SIB2/3-NB radioResourceConfigCommon Contents (partial)\n");
-      NPRACH_Parameters_NB_r13_t* nprach_parameter;
+      LTE_NPRACH_Parameters_NB_r13_t* nprach_parameter;
 
       //CE level 0
       if ( radioResourceConfigCommon->nprach_Config_r13.nprach_ParametersList_r13.list.array[0] != NULL) 

openair2/RRC/NBIOT/MESSAGES/asn1_msg_NB_IoT.c

@@ -151,6 +151,7 @@ uint8_t do_MIB_NB_IoT(
 //     (uint32_t)hsfn_LSB);
 
   enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_BCCH_BCH_Message_NB,
+                                    NULL,
                                    (void*)mib_NB_IoT,
                                    carrier->MIB_NB_IoT,
                                    100);
@@ -389,6 +390,7 @@ uint8_t do_SIB1_NB_IoT(uint8_t Mod_id, int CC_id,
 
   //bcch_message->message.choice.c1.choice.systemInformationBlockType1_r13 = **sib1_NB_IoT;
   enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_BCCH_DL_SCH_Message_NB,
+                                    NULL,
                                    (void*)bcch_message,
                                    carrier->SIB1_NB_IoT,
                                    100);
@@ -629,6 +631,7 @@ uint8_t do_SIB1_NB_IoT_x(uint8_t Mod_id, int CC_id,
 
   //bcch_message->message.choice.c1.choice.systemInformationBlockType1_r13 = **sib1_NB_IoT;
   enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_BCCH_DL_SCH_Message_NB,
+                                    NULL,
                                    (void*)bcch_message,
                                    carrier->SIB1_NB_IoT,
                                    100);
@@ -905,6 +908,7 @@ uint8_t do_SIB23_NB_IoT(uint8_t Mod_id,
   xer_fprint(stdout, &asn_DEF_LTE_BCCH_DL_SCH_Message_NB, (void*)bcch_message);
 #endif
   enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_BCCH_DL_SCH_Message_NB,
+                                    NULL,
                                    (void*)bcch_message,
                                    carrier->SIB23_NB_IoT,
                                    900);
@@ -942,7 +946,7 @@ uint8_t do_RRCConnectionSetup_NB_IoT(
   uint8_t*                   const buffer, //Srb0.Tx_buffer.Payload
   const uint8_t                    Transaction_id,
   LTE_SRB_ToAddModList_NB_r13_t**             SRB_configList_NB_IoT, //for both SRB1bis and SRB1
-  struct PhysicalConfigDedicated_NB_r13** physicalConfigDedicated_NB_IoT)
+  struct LTE_PhysicalConfigDedicated_NB_r13** physicalConfigDedicated_NB_IoT)
 {
   asn_enc_rval_t enc_rval;
   uint8_t ecause=0;
@@ -1111,6 +1115,7 @@ uint8_t do_RRCConnectionSetup_NB_IoT(
  xer_fprint(stdout, &asn_DEF_LTE_DL_CCCH_Message, (void*)&dl_ccch_msg);
 #endif
  enc_rval = uper_encode_to_buffer(&asn_DEF_LTE_DL_CCCH_Message_NB,
+                                  NULL,
                                   (void*)&dl_ccch_msg_NB_IoT,
                                   buffer,
                                   100);