Skip to content

O
OpenXG-RAN
Commit 42958e58 authored by Matthieu Kanj's avatar Matthieu Kanj
Browse files
Options

renaming + removing .h files from openair2/RRC/LITE/L2_interface_NB_IoT.c

parent 3a156e01
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 117 deletions
openair1/PHY/INIT/lte_init_NB_IoT.c
View file @ 42958e58
...@@ -197,7 +197,7 @@ void phy_config_sib2_eNB_NB_IoT(uint8_t Mod_id, ...@@ -197,7 +197,7 @@ void phy_config_sib2_eNB_NB_IoT(uint8_t Mod_id,
extra_phyConfig_t* extra_phy_parms) extra_phyConfig_t* extra_phy_parms)
{ {
NB_IoT_DL_FRAME_PARMS *fp = &PHY_vars_eNB_NB_IoT_g[Mod_id][CC_id]->frame_parms; NB_IoT_DL_FRAME_PARMS *fp = &PHY_vars_eNB_NB_IoT_g[Mod_id][CC_id]->frame_parms;
LOG_D(PHY,"[eNB%d] CCid %d: Applying nb_iot_config from sib2_NB\n",Mod_id,CC_id); LOG_D(PHY,"[eNB%d] CCid %d: Applying config_NB_IoT from sib2_NB\n",Mod_id,CC_id);
/*NPRACH_ConfigSIB_NB_r13----------------------------------------------------------*/ /*NPRACH_ConfigSIB_NB_r13----------------------------------------------------------*/
......
openair1/SCHED/IF_Module_L1_primitives_NB_IoT.c
View file @ 42958e58
...@@ -334,10 +334,10 @@ void PHY_config_req(PHY_Config_t* config_INFO){ ...@@ -334,10 +334,10 @@ void PHY_config_req(PHY_Config_t* config_INFO){
config_INFO->cfg->subframe_config.ul_cyclic_prefix_type.value, config_INFO->cfg->subframe_config.ul_cyclic_prefix_type.value,
config_INFO->cfg->rf_config.tx_antenna_ports.value, config_INFO->cfg->rf_config.tx_antenna_ports.value,
config_INFO->cfg->nfapi_config.earfcn.value, config_INFO->cfg->nfapi_config.earfcn.value,
config_INFO->cfg->nb_iot_config.prb_index.value, config_INFO->cfg->config_NB_IoT.prb_index.value,
config_INFO->cfg->nb_iot_config.operating_mode.value, config_INFO->cfg->config_NB_IoT.operating_mode.value,
config_INFO->cfg->nb_iot_config.control_region_size.value, config_INFO->cfg->config_NB_IoT.control_region_size.value,
config_INFO->cfg->nb_iot_config.assumed_crs_aps.value); //defined only in in-band different PCI config_INFO->cfg->config_NB_IoT.assumed_crs_aps.value); //defined only in in-band different PCI
} }
...@@ -346,7 +346,7 @@ void PHY_config_req(PHY_Config_t* config_INFO){ ...@@ -346,7 +346,7 @@ void PHY_config_req(PHY_Config_t* config_INFO){
//Common Configuration included in SIB2-NB //Common Configuration included in SIB2-NB
phy_config_sib2_eNB_NB_IoT(config_INFO->mod_id, phy_config_sib2_eNB_NB_IoT(config_INFO->mod_id,
config_INFO->CC_id, config_INFO->CC_id,
&config_INFO->cfg->nb_iot_config, // FIXME to be evaluated is should be passed a pointer &config_INFO->cfg->config_NB_IoT, // FIXME to be evaluated is should be passed a pointer
&config_INFO->cfg->rf_config, &config_INFO->cfg->rf_config,
&config_INFO->cfg->uplink_reference_signal_config, &config_INFO->cfg->uplink_reference_signal_config,
&config_INFO->extra_phy_parms); &config_INFO->extra_phy_parms);
......
openair2/LAYER2/RLC/rlc.c
View file @ 42958e58
...@@ -622,7 +622,7 @@ rlc_module_init (void) ...@@ -622,7 +622,7 @@ rlc_module_init (void)
#ifdef NB_IOT #ifdef NB_IOT
//MP: change variable maxDRB for NB-IoT --> see ifdef at the beginning //MP: change variable maxDRB for NB-IoT --> see ifdef at the beginning
rlc_rrc_data_ind_NB = NULL; rlc_rrc_data_ind_NB_IoT = NULL;
#endif #endif
......
openair2/LAYER2/RLC/rlc.h
View file @ 42958e58
...@@ -209,14 +209,14 @@ typedef void (rrc_data_conf_cb_t)( ...@@ -209,14 +209,14 @@ typedef void (rrc_data_conf_cb_t)(
// NB-IoT (may this stuff are no more used) // NB-IoT (may this stuff are no more used)
//------------------------------------------------ //------------------------------------------------
//pointer functions //pointer functions
protected_rlc(void (*rlc_rrc_data_ind_NB)( protected_rlc(void (*rlc_rrc_data_ind_NB_IoT)(
const protocol_ctxt_t* const ctxtP, const protocol_ctxt_t* const ctxtP,
const rb_id_t rb_idP, const rb_id_t rb_idP,
const sdu_size_t sdu_sizeP, const sdu_size_t sdu_sizeP,
const uint8_t * const sduP, const uint8_t * const sduP,
const srb1bis_flag_t srb1bis_flag);) const srb1bis_flag_t srb1bis_flag);)
typedef void (rrc_data_ind_cb_NB_t)( typedef void (rrc_data_ind_cb_NB_IoT_t)(
const protocol_ctxt_t* const ctxtP, const protocol_ctxt_t* const ctxtP,
const rb_id_t rb_idP, const rb_id_t rb_idP,
const sdu_size_t sdu_sizeP, const sdu_size_t sdu_sizeP,
......
openair2/PHY_INTERFACE/IF_Module_NB_IoT.h
View file @ 42958e58
...@@ -95,7 +95,7 @@ typedef struct{ ...@@ -95,7 +95,7 @@ typedef struct{
* -nfapi_subframe_config_t subframe_config; * -nfapi_subframe_config_t subframe_config;
* -nfapi_rf_config_t rf_config; * -nfapi_rf_config_t rf_config;
* -nfapi_sch_config_t sch_config; * -nfapi_sch_config_t sch_config;
* -nfapi_nb_iot_config_t nb_iot_config; * -nfapi_nb_iot_config_t config_NB_IoT;
* -nfapi_l23_config_t l23_config; * -nfapi_l23_config_t l23_config;
* -nfapi_config --> EARFCN (for the transport of the dl_CarrierFreq * -nfapi_config --> EARFCN (for the transport of the dl_CarrierFreq
* */ * */
......
openair2/PHY_INTERFACE/nfapi_interface.h
View file @ 42958e58
...@@ -1102,7 +1102,7 @@ typedef struct { ...@@ -1102,7 +1102,7 @@ typedef struct {
nfapi_uplink_reference_signal_config_t uplink_reference_signal_config; nfapi_uplink_reference_signal_config_t uplink_reference_signal_config;
nfapi_tdd_frame_structure_t tdd_frame_structure_config; nfapi_tdd_frame_structure_t tdd_frame_structure_config;
nfapi_l23_config_t l23_config; nfapi_l23_config_t l23_config;
nfapi_config_NB_IoT_t nb_iot_config; nfapi_config_NB_IoT_t config_NB_IoT;
// addition nfapi tlvs as per table 2-16 in idle or configure // addition nfapi tlvs as per table 2-16 in idle or configure
nfapi_nfapi_t nfapi_config; nfapi_nfapi_t nfapi_config;
...@@ -1125,7 +1125,7 @@ typedef struct { ...@@ -1125,7 +1125,7 @@ typedef struct {
nfapi_emtc_config_t emtc_config; nfapi_emtc_config_t emtc_config;
nfapi_tdd_frame_structure_t tdd_frame_structure_config; nfapi_tdd_frame_structure_t tdd_frame_structure_config;
nfapi_l23_config_t l23_config; nfapi_l23_config_t l23_config;
nfapi_config_NB_IoT_t nb_iot_config; nfapi_config_NB_IoT_t config_NB_IoT;
// addition nfapi tlvs as per table 2-16 in idle or configure // addition nfapi tlvs as per table 2-16 in idle or configure
nfapi_nfapi_t nfapi_config; nfapi_nfapi_t nfapi_config;
......
openair2/RRC/LITE/L2_interface_NB_IoT.c
View file @ 42958e58
This diff is collapsed.
openair2/RRC/LITE/MESSAGES/asn1_msg_NB_IoT.c
View file @ 42958e58
...@@ -1265,27 +1265,27 @@ uint8_t do_RRCConnectionReestablishment_NB_IoT( ...@@ -1265,27 +1265,27 @@ uint8_t do_RRCConnectionReestablishment_NB_IoT(
asn_enc_rval_t enc_rval; asn_enc_rval_t enc_rval;
DL_CCCH_Message_NB_t dl_ccch_msg_NB_IoT; DL_CCCH_Message_NB_t dl_ccch_msg_NB_IoT;
RRCConnectionReestablishment_NB_t* rrcConnectionReestablishment_NB; RRCConnectionReestablishment_NB_t* rrcConnectionReestablishment_NB_IoT;
memset(&dl_ccch_msg_NB_IoT, 0, sizeof(DL_CCCH_Message_NB_t)); memset(&dl_ccch_msg_NB_IoT, 0, sizeof(DL_CCCH_Message_NB_t));
dl_ccch_msg_NB_IoT.message.present = DL_CCCH_MessageType_NB_PR_c1; dl_ccch_msg_NB_IoT.message.present = DL_CCCH_MessageType_NB_PR_c1;
dl_ccch_msg_NB_IoT.message.choice.c1.present = DL_CCCH_MessageType_NB__c1_PR_rrcConnectionReestablishment_r13; dl_ccch_msg_NB_IoT.message.choice.c1.present = DL_CCCH_MessageType_NB__c1_PR_rrcConnectionReestablishment_r13;
rrcConnectionReestablishment_NB = &dl_ccch_msg_NB_IoT.message.choice.c1.choice.rrcConnectionReestablishment_r13; rrcConnectionReestablishment_NB_IoT = &dl_ccch_msg_NB_IoT.message.choice.c1.choice.rrcConnectionReestablishment_r13;
//rrcConnectionReestablishment_NB //rrcConnectionReestablishment_NB
rrcConnectionReestablishment_NB->rrc_TransactionIdentifier = Transaction_id; rrcConnectionReestablishment_NB_IoT->rrc_TransactionIdentifier = Transaction_id;
rrcConnectionReestablishment_NB->criticalExtensions.present = RRCConnectionReestablishment_NB__criticalExtensions_PR_c1; rrcConnectionReestablishment_NB_IoT->criticalExtensions.present = RRCConnectionReestablishment_NB__criticalExtensions_PR_c1;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.present = RRCConnectionReestablishment_NB__criticalExtensions__c1_PR_rrcConnectionReestablishment_r13; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.present = RRCConnectionReestablishment_NB__criticalExtensions__c1_PR_rrcConnectionReestablishment_r13;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.srb_ToAddModList_r13 = SRB_list_NB_IoT; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.srb_ToAddModList_r13 = SRB_list_NB_IoT;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.drb_ToAddModList_r13 = NULL; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.drb_ToAddModList_r13 = NULL;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.drb_ToReleaseList_r13 = NULL; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.drb_ToReleaseList_r13 = NULL;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.rlf_TimersAndConstants_r13= NULL; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.rlf_TimersAndConstants_r13= NULL;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.mac_MainConfig_r13= NULL; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.mac_MainConfig_r13= NULL;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13 = NULL; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13 = NULL;
rrcConnectionReestablishment_NB->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.nextHopChainingCount_r13=0; rrcConnectionReestablishment_NB_IoT->criticalExtensions.choice.c1.choice.rrcConnectionReestablishment_r13.nextHopChainingCount_r13=0;
enc_rval = uper_encode_to_buffer(&asn_DEF_DL_CCCH_Message_NB, enc_rval = uper_encode_to_buffer(&asn_DEF_DL_CCCH_Message_NB,
(void*)&dl_ccch_msg_NB_IoT, (void*)&dl_ccch_msg_NB_IoT,
......
openair2/RRC/LITE/proto_NB_IoT.h
View file @ 42958e58
...@@ -398,7 +398,7 @@ rlc_op_status_t rlc_data_req_NB_IoT (const protocol_ctxt_t* const ctxt_pP, ...@@ -398,7 +398,7 @@ rlc_op_status_t rlc_data_req_NB_IoT (const protocol_ctxt_t* const ctxt_pP,
//defined in rlc_rrc.c --> NO MORE USED PROBABLY //defined in rlc_rrc.c --> NO MORE USED PROBABLY
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void rrc_rlc_register_rrc_NB_IoT (rrc_data_ind_cb_NB_t NB_rrc_data_indP, rrc_data_conf_cb_t rrc_data_confP); void rrc_rlc_register_rrc_NB_IoT (rrc_data_ind_cb_NB_IoT_t rrc_data_indP_NB_IoT, rrc_data_conf_cb_t rrc_data_confP);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment