diff --git a/openair1/PHY/INIT/lte_init_nb_iot.c b/openair1/PHY/INIT/lte_init_nb_iot.c index 094c8943add8516762ba908aa48f47da077e20bf..27706cb12c9d5bbe749b578fcb55efee3c6c7677 100644 --- a/openair1/PHY/INIT/lte_init_nb_iot.c +++ b/openair1/PHY/INIT/lte_init_nb_iot.c @@ -64,7 +64,7 @@ void NB_phy_config_mib_eNB( AssertFatal(PHY_vars_eNB_g[Mod_id] != NULL, "PHY_vars_eNB_g instance %d doesn't exist\n",Mod_id); AssertFatal(PHY_vars_eNB_g[Mod_id][CC_id] != NULL, "PHY_vars_eNB_g instance %d, CCid %d doesn't exist\n",Mod_id,CC_id); - NB_DL_FRAME_PARMS *fp = &PHY_vars_eNB_g[Mod_id][CC_id]->frame_parms_nb_iot; + NB_IoT_DL_FRAME_PARMS *fp = &PHY_vars_eNB_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); @@ -98,7 +98,7 @@ void NB_phy_config_mib_eNB( // RadioResourceConfigCommonSIB_NB_r13_t *radioResourceConfigCommon // ) //{ -// NB_DL_FRAME_PARMS *fp = &PHY_vars_eNB_g[Mod_id][CC_id]->frame_parms; +// NB_IoT_DL_FRAME_PARMS *fp = &PHY_vars_eNB_g[Mod_id][CC_id]->frame_parms; // //LTE_eNB_UE_stats *eNB_UE_stats = PHY_vars_eNB_g[Mod_id][CC_id]->eNB_UE_stats; // //int32_t rx_total_gain_eNB_dB = PHY_vars_eNB_g[Mod_id][CC_id]->rx_total_gain_eNB_dB; // uint8_t MAX_NPRACH = 4; @@ -196,7 +196,7 @@ void NB_phy_config_sib2_eNB(uint8_t Mod_id, extra_phyConfig_t* extra_phy_parms ) { - NB_DL_FRAME_PARMS *fp = &PHY_vars_eNB_g[Mod_id][CC_id]->frame_parms; + NB_IoT_DL_FRAME_PARMS *fp = &PHY_vars_eNB_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); /*NPRACH_ConfigSIB_NB_r13----------------------------------------------------------*/ diff --git a/openair1/PHY/LTE_TRANSPORT/dci_nb_iot.c b/openair1/PHY/LTE_TRANSPORT/dci_nb_iot.c index 2a0d3965a7bcad97afc147db6d2cdc97056028e6..608f6224c949d5e4a82c496d688e870b0eee27a7 100755 --- a/openair1/PHY/LTE_TRANSPORT/dci_nb_iot.c +++ b/openair1/PHY/LTE_TRANSPORT/dci_nb_iot.c @@ -98,7 +98,7 @@ void dci_encoding_NB_IoT(uint8_t *a[2], // Array of two DCI pdus, even if one ///The scrambling sequence shall be initialised at the start of the search space and after every 4th NPDCCH subframes. /// /// -void npdcch_scrambling_NB_IoT(NB_DL_FRAME_PARMS *frame_parms, +void npdcch_scrambling_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms, uint8_t *e[2], // Input data int length, // Total number of bits to transmit in one subframe(case of DCI = G) uint8_t Ns,//XXX we pass the subframe // Slot number (0..19) @@ -160,7 +160,7 @@ void npdcch_scrambling_NB_IoT(NB_DL_FRAME_PARMS *frame_parms, } -int dci_allocate_REs_in_RB_NB_IoT(NB_DL_FRAME_PARMS *frame_parms, +int dci_allocate_REs_in_RB_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms, int32_t **txdataF, uint32_t *jj, uint32_t symbol_offset, @@ -399,7 +399,7 @@ int dci_allocate_REs_in_RB_NB_IoT(NB_DL_FRAME_PARMS *frame_parms, int dci_modulation_NB_IoT(int32_t **txdataF, int16_t amp, - NB_DL_FRAME_PARMS *frame_parms, + NB_IoT_DL_FRAME_PARMS *frame_parms, uint8_t control_region_size,//XXX we pass the npdcch_start_symbol // control region size for LTE , values between 0..3, (0 for stand-alone / 1, 2 or 3 for in-band) uint8_t *e[2], // Input data int G, // number of bits per subframe @@ -462,7 +462,7 @@ uint8_t generate_dci_top_NB_IoT( uint8_t Num_dci, DCI_ALLOC_NB_t *dci_alloc, int16_t amp, - NB_DL_FRAME_PARMS *fp, + NB_IoT_DL_FRAME_PARMS *fp, int32_t **txdataF, uint32_t subframe, uint8_t npdcch_start_symbol) diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c b/openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c index 4a4895eab17dc737297e0b8e92ead2e989e0b002..f840f0cd566fd3864861e9af37dbdec25b52e81a 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c +++ b/openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c @@ -147,7 +147,7 @@ int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB, uint16_t rnti, DCI_format_NB_t dci_format, NB_IoT_eNB_NDLSCH_t *ndlsch, - NB_DL_FRAME_PARMS *frame_parms, + NB_IoT_DL_FRAME_PARMS *frame_parms, uint8_t aggregation, uint8_t npdcch_start_symbol) { diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c index 18a0a436cc4a0e68c7c18b051933bcbc129725e4..62fdcc5e15516eaefce111db73de082ee3a992cf 100644 --- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c +++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c @@ -240,7 +240,7 @@ NB_IoT_eNB_NDLSCH_t *new_eNB_dlsch_NB(//unsigned char Kmimo, uint32_t Nsoft, //unsigned char N_RB_DL, uint8_t abstraction_flag, - NB_DL_FRAME_PARMS* frame_parms) + NB_IoT_DL_FRAME_PARMS* frame_parms) { NB_IoT_eNB_NDLSCH_t *dlsch; diff --git a/openair1/PHY/LTE_TRANSPORT/proto.h b/openair1/PHY/LTE_TRANSPORT/proto.h index e0106219d23f8f950b72744ffb24c552fced6420..474d2bfa96fbf8060a5e2583130cb4c796cfdaa2 100644 --- a/openair1/PHY/LTE_TRANSPORT/proto.h +++ b/openair1/PHY/LTE_TRANSPORT/proto.h @@ -67,7 +67,7 @@ NB_IoT_eNB_NDLSCH_t *new_eNB_dlsch_NB(//unsigned char Kmimo, uint32_t Nsoft, //unsigned char N_RB_DL, uint8_t abstraction_flag, - NB_DL_FRAME_PARMS* frame_parms); + NB_IoT_DL_FRAME_PARMS* frame_parms); diff --git a/openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h b/openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h index 589b81ab14d27af7d28f7f03c8a938eabef17637..53408b15996d426867eeea3578bf43ca8969eb10 100644 --- a/openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h +++ b/openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h @@ -111,7 +111,7 @@ int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB, uint16_t rnti, DCI_format_NB_t dci_format, NB_IoT_eNB_NDLSCH_t *ndlsch, - NB_DL_FRAME_PARMS *frame_parms, + NB_IoT_DL_FRAME_PARMS *frame_parms, uint8_t aggregation, uint8_t npdcch_start_symbol); @@ -121,7 +121,7 @@ uint8_t generate_dci_top_NB_IoT( uint8_t Num_dci, DCI_ALLOC_NB_t *dci_alloc, int16_t amp, - NB_DL_FRAME_PARMS *fp, + NB_IoT_DL_FRAME_PARMS *fp, int32_t **txdataF, uint32_t subframe, uint8_t npdcch_start_symbol); diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h index 6f9fc23abc4a6e56910fcc4e5a7feab0f4bbace9..db47e0ba55f7f42230e24b10fb389e3a7a16c784 100644 --- a/openair1/PHY/defs.h +++ b/openair1/PHY/defs.h @@ -709,7 +709,7 @@ typedef struct PHY_VARS_eNB_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_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; diff --git a/openair1/PHY/impl_defs_lte_nb_iot.h b/openair1/PHY/impl_defs_lte_nb_iot.h index 1e73a8d179d1bd057b35fc77abfa56940a5892f2..79063e6ca620c8b6815f88e438c25e71efe34083 100644 --- a/openair1/PHY/impl_defs_lte_nb_iot.h +++ b/openair1/PHY/impl_defs_lte_nb_iot.h @@ -265,7 +265,7 @@ typedef struct { uint16_t eutra_NumCRS_ports; -} NB_DL_FRAME_PARMS; +} NB_IoT_DL_FRAME_PARMS; #endif diff --git a/openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c b/openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c index adfc59d59f2d6a96f6ad950d11a53cb67f1883b4..68c04930adddcc171ccdd126ae383141f5d7d776 100644 --- a/openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c +++ b/openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c @@ -483,7 +483,7 @@ void NB_phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,UL_ void NB_generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t * proc,nfapi_dl_config_request_pdu_t *dl_config_pdu) { int UE_id = -1; - NB_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 *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_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 NB_phy_procedures_eNB_TX(PHY_VARS_eNB *eNB, int subframe = proc->subframe_tx; uint32_t i,aa; DCI_PDU_NB *dci_pdu = eNB->DCI_pdu; - NB_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; @@ -1214,7 +1214,7 @@ void NB_phy_procedures_eNB_TX(PHY_VARS_eNB *eNB, * The higher layer parms (Rmax): * -npdcch-NumRepetitions (UE-specific) [inside the NPDCCH UE-specific strucuture] --> configured through phyconfigDedicated * -npdcch-NumRepetitionPaging (common) - * -npdcch-NumRepetitions-RA (common) [inside the NB_DL_FRAME_PARMS-> nprach_ParametersList] --> configured in phy_config_sib2 + * -npdcch-NumRepetitions-RA (common) [inside the NB_IoT_DL_FRAME_PARMS-> nprach_ParametersList] --> configured in phy_config_sib2 * * PROBLEM: in FAPI specs seems there is no way to trasnmit Rmax to the PHY (waiting for answers) * diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg_nb_iot.c b/openair2/RRC/LITE/MESSAGES/asn1_msg_nb_iot.c index f6bd61c1fc2498ba8767b70bff73f3d51d7f857d..f847870d429800c5bba842b98a09544a2780a19d 100644 --- a/openair2/RRC/LITE/MESSAGES/asn1_msg_nb_iot.c +++ b/openair2/RRC/LITE/MESSAGES/asn1_msg_nb_iot.c @@ -664,7 +664,7 @@ uint8_t do_RRCConnectionSetup_NB( int CC_id, uint8_t* const buffer, //Srb0.Tx_buffer.Payload const uint8_t Transaction_id, - const NB_DL_FRAME_PARMS* const frame_parms, // maybe not used + const NB_IoT_DL_FRAME_PARMS* const frame_parms, // maybe not used SRB_ToAddModList_NB_r13_t** SRB_configList_NB, //for both SRB1bis and SRB1 struct PhysicalConfigDedicated_NB_r13** physicalConfigDedicated_NB ) diff --git a/openair2/RRC/LITE/rrc_eNB_nb_iot.c b/openair2/RRC/LITE/rrc_eNB_nb_iot.c index 478d2d8a53b56f76dbc84c0d79fe86da8a7c5782..a6969ae981f0fa94f8e70d120dacdb00ca72eb03 100644 --- a/openair2/RRC/LITE/rrc_eNB_nb_iot.c +++ b/openair2/RRC/LITE/rrc_eNB_nb_iot.c @@ -509,7 +509,7 @@ rrc_eNB_generate_RRCConnectionSetup_NB( //XXX MP:warning due to function still not completed at PHY (get_lte_frame_parms) //XXX this approach is gone most probably - NB_DL_FRAME_PARMS *fp = mac_xface->get_lte_frame_parms(ctxt_pP->module_id,CC_id); + NB_IoT_DL_FRAME_PARMS *fp = mac_xface->get_lte_frame_parms(ctxt_pP->module_id,CC_id); T(T_ENB_RRC_CONNECTION_SETUP, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame), T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti)); diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c index 43cdecab294c95dcbc34793270823dbba81c9156..24a06c6386bafabb1c566f3f437a68d0e865f9f0 100644 --- a/targets/RT/USER/lte-softmodem.c +++ b/targets/RT/USER/lte-softmodem.c @@ -169,7 +169,7 @@ int otg_enabled; static LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]; //NB-IoT -static NB_DL_FRAME_PARMS *frame_parms_nb_iot[MAX_NUM_CCs]; // this will be still inside the PHY_VARS of LTE +static NB_IoT_DL_FRAME_PARMS *frame_parms_nb_iot[MAX_NUM_CCs]; // this will be still inside the PHY_VARS of LTE eNB_func_t node_function[MAX_NUM_CCs]; eNB_timing_t node_timing[MAX_NUM_CCs]; @@ -1259,13 +1259,13 @@ void A(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) { } //NB_IoT------------------------------------------------- -void set_default_frame_parms_NB(NB_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]); -void set_default_frame_parms_NB(NB_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) { +void set_default_frame_parms_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]); +void set_default_frame_parms_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) { int CC_id; for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) { - frame_parms[CC_id] = (NB_DL_FRAME_PARMS*) malloc(sizeof(NB_DL_FRAME_PARMS)); + frame_parms[CC_id] = (NB_IoT_DL_FRAME_PARMS*) malloc(sizeof(NB_IoT_DL_FRAME_PARMS)); /* Set some default values that may be overwritten while reading options */ //XXX check if there are other parameters to be set @@ -1443,7 +1443,7 @@ int main( int argc, char **argv ) { // set default parameters set_default_frame_parms(frame_parms); #ifdef NB_IOT - set_default_frame_parms_NB(frame_parms_nb_iot); + set_default_frame_parms_NB_IoT(frame_parms_nb_iot); #endif diff --git a/targets/SIMU/USER/init_lte.c b/targets/SIMU/USER/init_lte.c index bdf78c3e05ae5dc7b6513da2b857c3fb19832326..ef4c293afe6d325460870c1239dc5cde652ce16a 100644 --- a/targets/SIMU/USER/init_lte.c +++ b/targets/SIMU/USER/init_lte.c @@ -156,7 +156,7 @@ PHY_VARS_eNB* init_lte_eNB(LTE_DL_FRAME_PARMS *frame_parms, void init_lte_eNB_NB( PHY_VARS_eNB *PHY_vars_eNB, - NB_DL_FRAME_PARMS *frame_parms, + NB_IoT_DL_FRAME_PARMS *frame_parms, uint8_t eNB_id, uint8_t Nid_cell, eNB_func_t node_function, @@ -168,7 +168,7 @@ void init_lte_eNB_NB( memset(PHY_vars_eNB,0,sizeof(PHY_VARS_eNB)); PHY_vars_eNB->Mod_id=eNB_id; PHY_vars_eNB->cooperation_flag=0;//cooperation_flag; - memcpy(&(PHY_vars_eNB->frame_parms_nb_iot), frame_parms, sizeof(NB_DL_FRAME_PARMS)); + memcpy(&(PHY_vars_eNB->frame_parms_nb_iot), frame_parms, sizeof(NB_IoT_DL_FRAME_PARMS)); PHY_vars_eNB->frame_parms_nb_iot.Nid_cell = ((Nid_cell/3)*3)+((eNB_id+Nid_cell)%3); //XXX NB_IoT ???? PHY_vars_eNB->frame_parms_nb_iot.nushift = PHY_vars_eNB->frame_parms.Nid_cell%6; phy_init_lte_eNB(PHY_vars_eNB,0,abstraction_flag);