Skip to content

O
OpenXG-RAN
Commit 443af7af authored by Matthieu Kanj's avatar Matthieu Kanj
Browse files
Options

renaming functions in file: openair2/RRC/LITE/proto_NB_IoT.h

parent c0b027b4
Show whitespace changes
Inline Side-by-side
Showing with 263 additions and 308 deletions
openair2/LAYER2/MAC/eNB_scheduler_ulsch_NB_IoT.c
View file @ 443af7af
......@@ -117,7 +117,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
/*RLF procedure this part just check UE context is NULL or not, if not, means UL in synch*/
if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync=0;
NB_mac_eNB_rrc_ul_in_sync(enb_mod_idP,CC_idP,frameP,subframeP,UE_RNTI(enb_mod_idP,UE_id));
mac_eNB_rrc_ul_in_sync_NB_IoT(enb_mod_idP,CC_idP,frameP,subframeP,UE_RNTI(enb_mod_idP,UE_id));
}
}
......@@ -160,7 +160,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
if (UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync > 0) {
UE_list->UE_sched_ctrl[UE_id].ul_out_of_sync=0;
/*In RRC branch*/
//NB_mac_eNB_rrc_ul_in_sync(enb_mod_idP,CC_idP,frameP,subframeP,(((uint16_t)payload_ptr[0])<<8) + payload_ptr[1]);
//mac_eNB_rrc_ul_in_sync_NB_IoT(enb_mod_idP,CC_idP,frameP,subframeP,(((uint16_t)payload_ptr[0])<<8) + payload_ptr[1]);
}
}
crnti_rx=1;
......@@ -268,7 +268,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
if (Is_rrc_nb_iot_registered == 1)
//MP: send directly the information to the RRC in case of CCCH (SRB0)
NB_mac_rrc_data_ind_eNB(
mac_rrc_data_ind_eNB_NB_IoT(
enb_mod_idP,
CC_idP,
frameP,
......@@ -316,7 +316,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
LOG_D(MAC,"[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
enb_mod_idP,CC_idP,frameP, rx_lengths[i], UE_id, rx_lcids[i]);
NB_mac_rlc_data_ind(
mac_rlc_data_ind_NB_IoT(
enb_mod_idP,
rntiP,
enb_mod_idP,
......@@ -361,7 +361,7 @@ void rx_sdu_NB_IoT(const module_id_t enb_mod_idP,
UE_list->UE_template[CC_idP][UE_id].ul_buffer_info[UE_list->UE_template[CC_idP][UE_id].lcgidmap[rx_lcids[i]]] = 0;*/
if ((rx_lengths[i] <SCH_PAYLOAD_SIZE_MAX) && (rx_lengths[i] > 0) ) { // MAX SIZE OF transport block
NB_mac_rlc_data_ind(
mac_rlc_data_ind_NB_IoT(
enb_mod_idP,
rntiP,
enb_mod_idP,
......
openair2/LAYER2/MAC/main_NB_IoT.c
View file @ 443af7af
......@@ -137,7 +137,7 @@ int mac_top_init_NB_IoT()
if (Is_rrc_nb_iot_registered == 1) {
LOG_I(MAC,"[MAIN] calling RRC NB-IoT\n");
#ifndef CELLULAR //nothing to be done yet for cellular
openair_rrc_top_init_eNB_NB();
openair_rrc_top_init_eNB_NB_IoT();
#endif
} else {
LOG_I(MAC,"[MAIN] Running without an RRC\n");
......
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @ 443af7af
......@@ -1680,7 +1680,7 @@ pdcp_config_set_security(
}
/*]SecurityModeFailure*/
else if(security_modeP == -1){
// in this way in NB_pdcp_data_req function you never call "pdcp_apply_security"
// in this way in pdcp_data_req_NB_IoT function you never call "pdcp_apply_security"
// and we never call pdcp_validate_security in NB_pdcp_data_indi
pdcp_pP->security_activated = 0;
pdcp_pP->cipheringAlgorithm = 0;
......
openair2/PHY_INTERFACE/IF_Module_NB_IoT.h
View file @ 443af7af
......@@ -78,7 +78,7 @@ typedef struct{
module_id_t mod_id;
int CC_id;
uint16_t rnti;
int get_MIB; //should be different from 0 only when the mib!= null (NB_rrc_mac_config_req_eNB)
int get_MIB; //should be different from 0 only when the mib!= null (NB_rrc_mac_config_req_eNB_IoT)
int get_COMMON;
int get_DEDICATED;
......
openair2/RRC/LITE/L2_interface_NB_IoT.c
View file @ 443af7af
......@@ -269,7 +269,7 @@ void config_mib_NB_fapi(
config_INFO->cfg->nb_iot_config.assumed_crs_aps.value = -1; //is not defined so we put a negative value
if(eutraControlRegionSize == NULL)
LOG_E(RRC, "NB_rrc_mac_config_req_eNB: operation mode is in-band but eutraControlRegionSize is not defined");
LOG_E(RRC, "rrc_mac_config_req_eNB_NB_IoT: operation mode is in-band but eutraControlRegionSize is not defined");
else
config_INFO->cfg->nb_iot_config.control_region_size.value = *eutraControlRegionSize;
......@@ -288,7 +288,7 @@ void config_mib_NB_fapi(
config_INFO->cfg->nb_iot_config.assumed_crs_aps.value = mib_NB->message.operationModeInfo_r13.choice.inband_DifferentPCI_r13.eutra_NumCRS_Ports_r13;
if(eutraControlRegionSize == NULL)
LOG_E(RRC, "NB_rrc_mac_config_req_eNB: operation mode is in-band but eutraControlRegionSize is not defined");
LOG_E(RRC, "rrc_mac_config_req_eNB_NB_IoT: operation mode is in-band but eutraControlRegionSize is not defined");
else
config_INFO->cfg->nb_iot_config.control_region_size.value = *eutraControlRegionSize;
......@@ -322,7 +322,7 @@ void config_mib_NB_fapi(
break;
default:
LOG_E(RRC, "NB_rrc_mac_config_req_eNB: NB-IoT operating Mode (MIB-NB) not set\n");
LOG_E(RRC, "rrc_mac_config_req_eNB_NB_IoT: NB-IoT operating Mode (MIB-NB) not set\n");
break;
}
......@@ -475,7 +475,7 @@ void config_sib2_NB_fapi(
break;
default:
LOG_E(RRC,"NB_rrc_mac_config_req_eNB: nprach_ParametersList size not valid\n");
LOG_E(RRC,"rrc_mac_config_req_eNB_NB_IoT: nprach_ParametersList size not valid\n");
break;
}
......@@ -559,7 +559,7 @@ void config_sib2_NB_fapi(
//defined in MAC/config.c
//FIXME: this function has no implication in terms of logical channel configuration for MAC
int NB_rrc_mac_config_req_eNB(
int rrc_mac_config_req_eNB_NB_IoT(
module_id_t Mod_idP,
int CC_idP,
int rntiP,
......@@ -636,7 +636,7 @@ int NB_rrc_mac_config_req_eNB(
*/
//XXX where allocate memory for cfg??
if(config_INFO->cfg == NULL) LOG_E(MAC, "NB_rrc_mac_config_req_eNB: trying to configure PHY but no config.request message in config_INFO is allocated\n");
if(config_INFO->cfg == NULL) LOG_E(MAC, "rrc_mac_config_req_eNB_NB_IoT: trying to configure PHY but no config.request message in config_INFO is allocated\n");
//Mapping OAI params into FAPI params
......@@ -661,7 +661,7 @@ int NB_rrc_mac_config_req_eNB(
if (radioResourceConfigCommon!=NULL) {
if(config_INFO->cfg == NULL) LOG_E(MAC, "NB_rrc_mac_config_req_eNB: trying to configure PHY but no config.request message in config_INFO is allocated\n");
if(config_INFO->cfg == NULL) LOG_E(MAC, "rrc_mac_config_req_eNB_NB_IoT: trying to configure PHY but no config.request message in config_INFO is allocated\n");
config_INFO->get_COMMON = 1;
......@@ -684,7 +684,7 @@ int NB_rrc_mac_config_req_eNB(
if (logicalChannelConfig!= NULL) {
if(config_INFO->cfg == NULL) LOG_E(MAC, "NB_rrc_mac_config_req_eNB: trying to configure PHY but no config.request message in config_INFO is allocated\n");
if(config_INFO->cfg == NULL) LOG_E(MAC, "rrc_mac_config_req_eNB_NB_IoT: trying to configure PHY but no config.request message in config_INFO is allocated\n");
if (UE_id == -1) {
LOG_E(MAC,"%s:%d:%s: ERROR, UE_id == -1\n", __FILE__, __LINE__, __FUNCTION__);
......@@ -698,7 +698,7 @@ int NB_rrc_mac_config_req_eNB(
if (physicalConfigDedicated != NULL) {
if(config_INFO->cfg == NULL) LOG_E(MAC, "NB_rrc_mac_config_req_eNB: trying to configure PHY but no config.request message in config_INFO is allocated\n");
if(config_INFO->cfg == NULL) LOG_E(MAC, "rrc_mac_config_req_eNB_NB_IoT: trying to configure PHY but no config.request message in config_INFO is allocated\n");
if (UE_id == -1)
LOG_E(MAC,"%s:%d:%s: ERROR, UE_id == -1\n", __FILE__, __LINE__, __FUNCTION__);
......@@ -721,7 +721,7 @@ int NB_rrc_mac_config_req_eNB(
}
//Now trigger the phy_config_xxx for configuring PHY through the PHY_config_req
AssertFatal(if_inst->PHY_config_req != NULL, "NB_rrc_mac_config_req_eNB: PHY_config_req pointer function is NULL\n");
AssertFatal(if_inst->PHY_config_req != NULL, "rrc_mac_config_req_eNB_NB_IoT: PHY_config_req pointer function is NULL\n");
if(if_inst->PHY_config_req)
if_inst->PHY_config_req(config_INFO);
......@@ -959,7 +959,7 @@ int si_windowLength_to_rf[7]={16,32,48,64,96,128,160}; //TS 36.331 v14.2.1 pag
int si_repPattern_to_nb[4]={2,4,8,16};
int si_period_to_nb[7]={64,128,256,512,1024,2048,4096};
//New---------------------------------------------------------------------------
boolean_t is_SIB23_NB(
boolean_t is_SIB23_NB_IoT(
const frame_t frameP,
const frame_t h_frameP, // the HSFN (increased by 1 every SFN wrap around) (10 bits)
long si_period, //SI-periodicity (value given by the Enumerative of the SIB1-NB)
......@@ -1018,7 +1018,7 @@ boolean_t is_SIB23_NB(
if(si_period == SchedulingInfo_NB_r13__si_Periodicity_r13_spare)
{
LOG_E(RRC, "is_SIB23_NB: Invalid parameters in SIB1-NB --> si_periodicity not defined (spare value)\n");
LOG_E(RRC, "is_SIB23_NB_IoT: Invalid parameters in SIB1-NB --> si_periodicity not defined (spare value)\n");
return FALSE;
}
......@@ -1039,7 +1039,7 @@ boolean_t is_SIB23_NB(
}
if(si_windowLength_ms == SystemInformationBlockType1_NB__si_WindowLength_r13_spare1){
LOG_E(RRC, "is_SIB23_NB: Invalid parameters in SIB1-NB --> si_windowLength not defined (spare value)\n");
LOG_E(RRC, "is_SIB23_NB_IoT: Invalid parameters in SIB1-NB --> si_windowLength not defined (spare value)\n");
return FALSE;
}
......@@ -1047,7 +1047,7 @@ boolean_t is_SIB23_NB(
si_windowLength = si_windowLength_to_rf[si_windowLength_ms];
if(si_windowLength > si_periodicity){
LOG_E(RRC, "is_SIB23_NB: Invalid parameters in SIB1-NB --> si_windowLength > si_periodicity\n");
LOG_E(RRC, "is_SIB23_NB_IoT: Invalid parameters in SIB1-NB --> si_windowLength > si_periodicity\n");
return FALSE;
}
......@@ -1099,7 +1099,7 @@ boolean_t is_SIB23_NB(
//function called by eNB_dlsch_ulsch_scheduler--> Schedule_SI (eNB_scheduler_bch) for getting the bcch_sdu_legnth (BCCH case for SIBs and MIB)
//Function called in schedule_RA for getting RRCConnectionSetup message (Msg4) length of rrc_sdu_length (CCCH case)
//Function will be called by schedule_MIB??? when subframe#0
int8_t NB_mac_rrc_data_req_eNB(
int8_t mac_rrc_data_req_eNB_NB_IoT(
const module_id_t Mod_idP,
const int CC_id,
const frame_t frameP,
......@@ -1118,7 +1118,7 @@ int8_t NB_mac_rrc_data_req_eNB(
#ifdef DEBUG_RRC
int i;
LOG_T(RRC,"[eNB %d] NB_mac_rrc_data_req_eNB to SRB ID=%d\n",Mod_idP,Srb_id);
LOG_T(RRC,"[eNB %d] mac_rrc_data_req_eNB_NB_IoT to SRB ID=%d\n",Mod_idP,Srb_id);
#endif
......@@ -1131,7 +1131,7 @@ int8_t NB_mac_rrc_data_req_eNB(
//XXX to be check when MIB-NB should be initialized
if (eNB_rrc_inst_NB[Mod_idP].carrier[CC_id].sizeof_MIB_NB == 255) {
LOG_E(RRC,"[eNB %d] MAC Request for MIB-NB and MIB-NB not initialized\n",Mod_idP);
mac_xface->macphy_exit("NB_mac_rrc_data_req_eNB: MAC Request for MIB-NB and MIB-NB not initialized");
mac_xface->macphy_exit("mac_rrc_data_req_eNB_NB_IoT: MAC Request for MIB-NB and MIB-NB not initialized");
}
memcpy(&buffer_pP[0],
......@@ -1170,12 +1170,12 @@ int8_t NB_mac_rrc_data_req_eNB(
//FIXME to be check when both are initialize and if make sense to have it
if (eNB_rrc_inst_NB[Mod_idP].carrier[CC_id].sizeof_SIB1_NB == 255) {
LOG_E(RRC,"[eNB %d] MAC Request for SIB1-NB and SIB1-NB not initialized\n",Mod_idP);
mac_xface->macphy_exit("NB_mac_rrc_data_req_eNB: MAC Request for SIB1-NB and SIB1-NB not initialized");
mac_xface->macphy_exit("mac_rrc_data_req_eNB_NB_IoT: MAC Request for SIB1-NB and SIB1-NB not initialized");
}
if (eNB_rrc_inst_NB[Mod_idP].carrier[CC_id].sizeof_SIB23_NB == 255) {
LOG_E(RRC,"[eNB %d] MAC Request for SIB23-NB and SIB23-NB not initialized\n",Mod_idP);
mac_xface->macphy_exit("NB_mac_rrc_data_req_eNB: MAC Request for SIB23-NB and SIB23-NB not initialized");
mac_xface->macphy_exit("mac_rrc_data_req_eNB_NB_IoT: MAC Request for SIB23-NB and SIB23-NB not initialized");
}
......@@ -1207,7 +1207,7 @@ int8_t NB_mac_rrc_data_req_eNB(
//check for SIB23-Transmission
for(int i = 0; i< eNB_rrc_inst_NB[Mod_idP].carrier[CC_id].sib1_NB->schedulingInfoList_r13.list.count; i++){
if(is_SIB23_NB(frameP,h_frameP,
if(is_SIB23_NB_IoT(frameP,h_frameP,
eNB_rrc_inst_NB[Mod_idP].carrier[CC_id].sib1_NB->schedulingInfoList_r13.list.array[i]->si_Periodicity_r13,
eNB_rrc_inst_NB[Mod_idP].carrier[CC_id].sib1_NB->si_WindowLength_r13,
eNB_rrc_inst_NB[Mod_idP].carrier[CC_id].sib1_NB->si_RadioFrameOffset_r13,
......@@ -1318,7 +1318,7 @@ int8_t NB_mac_rrc_data_ind_eNB(
if (sdu_lenP > 0) {
memcpy(Srb_info->Rx_buffer.Payload,sduP,sdu_lenP);
Srb_info->Rx_buffer.payload_size = sdu_lenP;
rrc_eNB_decode_ccch_NB(&ctxt, Srb_info, CC_id);
rrc_eNB_decode_ccch_NB_IoT(&ctxt, Srb_info, CC_id);
}
#endif
......@@ -1328,7 +1328,7 @@ int8_t NB_mac_rrc_data_ind_eNB(
//defined in L2_interface
void NB_mac_eNB_rrc_ul_failure(
void mac_eNB_rrc_ul_failure_NB_IoT(
const module_id_t mod_idP,
const int CC_idP,
const frame_t frameP,
......@@ -1353,7 +1353,7 @@ void NB_mac_eNB_rrc_ul_failure(
//defined in eNB_scheduler_primitives.c
void dump_ue_list_NB(UE_list_NB_IoT_t *listP, int ul_flag)
void dump_ue_list_NB_IoT(UE_list_NB_IoT_t *listP, int ul_flag)
{
int j;
......@@ -1391,7 +1391,7 @@ printf("MAC: cannot remove UE rnti %x\n", rntiP);
printf("MAC: remove UE %d rnti %x\n", UE_id, rntiP);
LOG_I(MAC,"Removing UE %d from Primary CC_id %d (rnti %x)\n",UE_id,pCC_id, rntiP);
dump_ue_list_NB(UE_list,0);
dump_ue_list_NB_IoT(UE_list,0);
UE_list->active[UE_id] = FALSE;
UE_list->num_UEs--;
......@@ -1434,7 +1434,7 @@ printf("MAC: remove UE %d rnti %x\n", UE_id, rntiP);
//defined in L2_interface
void NB_mac_eNB_rrc_ul_in_sync(
void mac_eNB_rrc_ul_in_sync_NB_IoT(
const module_id_t mod_idP,
const int CC_idP,
const frame_t frameP,
......@@ -1457,7 +1457,7 @@ void NB_mac_eNB_rrc_ul_in_sync(
}
//defined in L2_interface
int NB_mac_eNB_get_rrc_status(
int mac_eNB_get_rrc_status_NB_IoT(
const module_id_t Mod_idP,
const rnti_t rntiP
)
......@@ -1507,10 +1507,9 @@ uint32_t pdcp_get_next_count_tx_NB(
//defined in pdcp_security.c
//called in NB_pdcp_data_req
//called in pdcp_data_req_NB_IoT
//-----------------------------------------------------------------------------
int
NB_pdcp_apply_security(
int pdcp_apply_security_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
pdcp_t *const pdcp_pP,
const srb_flag_t srb_flagP,
......@@ -1580,7 +1579,7 @@ NB_pdcp_apply_security(
//FIXME for the moment we not configure PDCP for SRB1bis (but used as it is SRB1)
//defined in pdcp.c
boolean_t NB_rrc_pdcp_config_asn1_req (
boolean_t rrc_pdcp_config_asn1_req_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
SRB_ToAddModList_NB_r13_t *const srb2add_list_pP,
DRB_ToAddModList_NB_r13_t *const drb2add_list_pP,
......@@ -1639,7 +1638,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
/*Security Mode Failure*/
if(security_modeP == -1){
LOG_D(PDCP, "SecurityModeFailure --> NB_rrc_pdcp_config_asn1_req --> Disabling security for srb2add_list_pP\n");
LOG_D(PDCP, "SecurityModeFailure --> rrc_pdcp_config_asn1_req_NB_IoT --> Disabling security for srb2add_list_pP\n");
for(int cnt=0; cnt< srb2add_list_pP->list.count; cnt++)
{
......@@ -1648,7 +1647,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
h_rc = hashtable_get(pdcp_coll_p,key, (void**)&pdcp_p);
if(h_rc != HASH_TABLE_OK){
LOG_I(PDCP, "SecurityModeFailure --> NB_rrc_pdcp_config_asn1_req not available pdcp entity for disable security for this SRB");
LOG_I(PDCP, "SecurityModeFailure --> rrc_pdcp_config_asn1_req_NB_IoT not available pdcp entity for disable security for this SRB");
continue;
}
......@@ -1712,7 +1711,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
default:
//configure the pdcp depend on the action
//is a switch case on the "action" parameter
NB_pdcp_config_req_asn1 (
pdcp_config_req_asn1_NB_IoT (
ctxt_pP,
pdcp_p,
SRB_FLAG_YES,
......@@ -1733,7 +1732,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
break;
case SRB_ToAddMod_NB_r13__rlc_Config_r13_PR_defaultValue:
NB_pdcp_config_req_asn1 (
pdcp_config_req_asn1_NB_IoT (
ctxt_pP,
pdcp_p,
SRB_FLAG_YES,
......@@ -1871,7 +1870,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
break;
}
NB_pdcp_config_req_asn1 (
pdcp_config_req_asn1_NB_IoT (
ctxt_pP,
pdcp_p,
SRB_FLAG_NO,
......@@ -1906,7 +1905,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
lc_id = pdcp_p->lcid;
action = CONFIG_ACTION_REMOVE;
NB_pdcp_config_req_asn1 (
pdcp_config_req_asn1_NB_IoT (
ctxt_pP,
pdcp_p,
SRB_FLAG_NO,
......@@ -1943,8 +1942,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
//defined in pdcp.c --> should be called only by a SRB1 (is internal to PDCP so is not an interface)
//-----------------------------------------------------------------------------
boolean_t
NB_pdcp_config_req_asn1 (
boolean_t pdcp_config_req_asn1_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
pdcp_t * const pdcp_pP,
const srb_flag_t srb_flagP,
......@@ -2103,7 +2101,7 @@ NB_pdcp_config_req_asn1 (
//defined in L2_interface/pdcp.c
//FIXME SRB1bis should bypass the pdcp
//Distinction between different SRBs will be done by means of rd_id
uint8_t NB_rrc_data_req(
uint8_t rrc_data_req_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const rb_id_t rb_idP,
const mui_t muiP,
......@@ -2165,7 +2163,7 @@ uint8_t NB_rrc_data_req(
#else
//MP:in this case since is called by RRC for sure we have "SRB_FLAG_YES"
return NB_pdcp_data_req(
return pdcp_data_req_NB_IoT(
ctxt_pP,
SRB_FLAG_YES,
rb_idP,
......@@ -2179,7 +2177,7 @@ uint8_t NB_rrc_data_req(
//we distinguish the SRBs based on the logical channel id and the transmission mode
boolean_t NB_pdcp_data_req(
boolean_t pdcp_data_req_NB_IoT(
protocol_ctxt_t* ctxt_pP,
const srb_flag_t srb_flagP, //SRB_FLAG_YES if called by RRC
const rb_id_t rb_idP,
......@@ -2292,7 +2290,7 @@ boolean_t NB_pdcp_data_req(
sdu_buffer_sizeP);
#endif
rlc_status = NB_rlc_data_req(ctxt_pP, srb_flagP, rb_idP, muiP, confirmP, sdu_buffer_sizeP, pdcp_pdu_p);
rlc_status = rlc_data_req_NB_IoT(ctxt_pP, srb_flagP, rb_idP, muiP, confirmP, sdu_buffer_sizeP, pdcp_pdu_p);
//MP: if all ok rlc_status = RLC_OP_STATUS_OK
} else {
......@@ -2428,7 +2426,7 @@ boolean_t NB_pdcp_data_req(
}
NB_pdcp_apply_security(ctxt_pP,
pdcp_apply_security_NB_IoT(ctxt_pP,
pdcp_p,
srb_flagP,
rb_idP % maxDRB_NB_r13,
......@@ -2486,7 +2484,7 @@ boolean_t NB_pdcp_data_req(
LOG_F(PDCP,"\n");
#endif
rlc_status = NB_rlc_data_req(ctxt_pP, srb_flagP,rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p);
rlc_status = rlc_data_req_NB_IoT(ctxt_pP, srb_flagP,rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p);
}
......@@ -2537,7 +2535,7 @@ boolean_t NB_pdcp_data_req(
//defined in L2_interface
//called by the PDCP in the pdcp_data_ind
//mapped to rlc_rrc_data_ind (but maybe no more used for this purpose)
void NB_rrc_data_ind(
void rrc_data_ind_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const rb_id_t Srb_id,
const sdu_size_t sdu_sizeP,
......@@ -2590,7 +2588,7 @@ void NB_rrc_data_ind(
#else
if (ctxt_pP->enb_flag == ENB_FLAG_YES) {
rrc_eNB_decode_dcch_NB(
rrc_eNB_decode_dcch_NB_IoT(
ctxt_pP,
DCCH_index, // becomes the srb_id in decode_dcch
buffer_pP,
......@@ -2612,7 +2610,7 @@ void NB_rrc_data_ind(
/*---------------------------------RRC-RLC-----------------------------------*/
//defined in rlc_rrc.c
rlc_op_status_t NB_rrc_rlc_config_asn1_req (
rlc_op_status_t rrc_rlc_config_asn1_req_NB_IoT (
const protocol_ctxt_t * const ctxt_pP,
const SRB_ToAddModList_NB_r13_t * const srb2add_listP,
const DRB_ToAddModList_NB_r13_t * const drb2add_listP,
......@@ -2674,8 +2672,8 @@ rlc_op_status_t NB_rrc_rlc_config_asn1_req (
break;
case RLC_Config_NB_r13_PR_am:
if (NB_rrc_rlc_add_rlc (ctxt_pP, SRB_FLAG_YES, rb_id, lc_id, RLC_MODE_AM) != NULL) {
NB_config_req_rlc_am_asn1 (
if (rrc_rlc_add_rlc_NB_IoT (ctxt_pP, SRB_FLAG_YES, rb_id, lc_id, RLC_MODE_AM) != NULL) {
config_req_rlc_am_asn1_NB_IoT (
ctxt_pP,
SRB_FLAG_YES,
&srb_toaddmod_p->rlc_Config_r13->choice.explicitValue.choice.am,
......@@ -2706,8 +2704,8 @@ rlc_op_status_t NB_rrc_rlc_config_asn1_req (
config_am_pP->ul_AM_RLC_r13.maxRetxThreshold_r13 = UL_AM_RLC_NB_r13__maxRetxThreshold_r13_t4;
config_am_pP->dl_AM_RLC_r13.enableStatusReportSN_Gap_r13 = NULL; //should be disabled
if (NB_rrc_rlc_add_rlc (ctxt_pP, SRB_FLAG_YES, rb_id, lc_id, RLC_MODE_AM) != NULL) {
NB_config_req_rlc_am_asn1 (
if (rrc_rlc_add_rlc_NB_IoT (ctxt_pP, SRB_FLAG_YES, rb_id, lc_id, RLC_MODE_AM) != NULL) {
config_req_rlc_am_asn1_NB_IoT (
ctxt_pP,
SRB_FLAG_YES,
&srb_toaddmod_p->rlc_Config_r13->choice.explicitValue.choice.am,
......@@ -2754,8 +2752,8 @@ rlc_op_status_t NB_rrc_rlc_config_asn1_req (
break;
case RLC_Config_NB_r13_PR_am:
if (NB_rrc_rlc_add_rlc (ctxt_pP, SRB_FLAG_NO, drb_id, lc_id, RLC_MODE_AM) != NULL) {
NB_config_req_rlc_am_asn1 (
if (rrc_rlc_add_rlc_NB_IoT (ctxt_pP, SRB_FLAG_NO, drb_id, lc_id, RLC_MODE_AM) != NULL) {
config_req_rlc_am_asn1_NB_IoT (
ctxt_pP,
SRB_FLAG_NO,
&drb_toaddmod_p->rlc_Config_r13->choice.am,
......@@ -2776,7 +2774,7 @@ rlc_op_status_t NB_rrc_rlc_config_asn1_req (
if (drb2release_listP != NULL) {
for (cnt=0; cnt<drb2release_listP->list.count; cnt++) {
pdrb_id = drb2release_listP->list.array[cnt];
NB_rrc_rlc_remove_rlc(
rrc_rlc_remove_rlc_NB_IoT(
ctxt_pP,
SRB_FLAG_NO,
*pdrb_id);
......@@ -2795,7 +2793,7 @@ rlc_op_status_t NB_rrc_rlc_config_asn1_req (
uint32_t pollRetransmit_NB_tab[T_PollRetransmit_NB_r13_spare1] = {250,500,1000,2000,3000,4000,6000,10000,15000,25000,40000,60000,90000,120000,180000};
uint32_t maxRetxThreshold_NB_tab[UL_AM_RLC_NB_r13__maxRetxThreshold_r13_t32 +1] = {1,2,3,4,6,8,16,32};
//-----------------------------------------------------------------------------
void NB_config_req_rlc_am_asn1 (
void config_req_rlc_am_asn1_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const struct RLC_Config_NB_r13__am * const config_am_pP, //extracted from the srb_toAddMod
......@@ -2836,7 +2834,7 @@ void NB_config_req_rlc_am_asn1 (
//XXX: the following function are ok for NB_IoT??
rlc_am_init(ctxt_pP, l_rlc_p);
rlc_am_set_debug_infos(ctxt_pP, l_rlc_p, srb_flagP, rb_idP, chan_idP);
NB_rlc_am_configure(ctxt_pP,
rlc_am_configure_NB_IoT(ctxt_pP,
l_rlc_p,
maxRetxThreshold_NB_tab[config_am_pP->ul_AM_RLC_r13.maxRetxThreshold_r13],
pollRetransmit_NB_tab[config_am_pP->ul_AM_RLC_r13.t_PollRetransmit_r13],
......@@ -2865,8 +2863,7 @@ void NB_config_req_rlc_am_asn1 (
//defined in rlc_am_init.c
//-----------------------------------------------------------------------------
void
NB_rlc_am_configure(
void rlc_am_configure_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rlc_am_entity_t *const rlc_pP,
const uint16_t max_retx_thresholdP,
......@@ -2911,7 +2908,7 @@ NB_rlc_am_configure(
//defined in rlc_rrc.c
//-----------------------------------------------------------------------------
rlc_union_t* NB_rrc_rlc_add_rlc (
rlc_union_t* rrc_rlc_add_rlc_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rb_id_t rb_idP,
......@@ -2992,7 +2989,7 @@ rlc_union_t* NB_rrc_rlc_add_rlc (
//defined in rlc_rrc.c
//-----------------------------------------------------------------------------
rlc_op_status_t NB_rrc_rlc_remove_rlc (
rlc_op_status_t rrc_rlc_remove_rlc_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rb_id_t rb_idP)
......@@ -3011,7 +3008,7 @@ rlc_op_status_t NB_rrc_rlc_remove_rlc (
#endif
if(rb_idP == 2){
LOG_E(RLC, PROTOCOL_CTXT_FMT"[%s %u] NB_rrc_rlc_remove_rlc --> rb_id = 2 (SRB2) should not be used in NB-IoT!\n",
LOG_E(RLC, PROTOCOL_CTXT_FMT"[%s %u] rrc_rlc_remove_rlc_NB_IoT --> rb_id = 2 (SRB2) should not be used in NB-IoT!\n",
PROTOCOL_CTXT_ARGS(ctxt_pP),
(srb_flagP) ? "SRB" : "DRB",
rb_idP);
......@@ -3023,7 +3020,7 @@ rlc_op_status_t NB_rrc_rlc_remove_rlc (
{
//MP: this function know that if i have to search for a DRB the rb_idP that i pass could also be 1,3,... so add something ??
//see NB_rrc_rlc_remove_ue
//see rrc_rlc_remove_ue_NB_IoT
key = RLC_COLL_KEY_VALUE(ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, rb_idP, srb_flagP);
}
......@@ -3082,7 +3079,7 @@ rlc_op_status_t NB_rrc_rlc_remove_rlc (
//defined in rlc_rrc.c
//used only for rrc_t310_expiration --> I don't know if it is used (probably not)
rlc_op_status_t NB_rrc_rlc_config_req (
rlc_op_status_t rrc_rlc_config_req_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const config_action_t actionP,
......@@ -3107,7 +3104,7 @@ rlc_op_status_t NB_rrc_rlc_config_req (
//XXX MP:this functuion is not used for adding rlc instance
case CONFIG_ACTION_ADD:
if (NB_rrc_rlc_add_rlc(ctxt_pP, srb_flagP, rb_idP, rb_idP, rlc_infoP.rlc_mode) != NULL) {
if (rrc_rlc_add_rlc_NB_IoT(ctxt_pP, srb_flagP, rb_idP, rb_idP, rlc_infoP.rlc_mode) != NULL) {
return RLC_OP_STATUS_INTERNAL_ERROR;
}
......@@ -3119,7 +3116,7 @@ rlc_op_status_t NB_rrc_rlc_config_req (
PROTOCOL_CTXT_ARGS(ctxt_pP),
rb_idP);
NB_config_req_rlc_am(
config_req_rlc_am_NB_IoT(
ctxt_pP,
srb_flagP,
&rlc_infoP.rlc.rlc_am_info_NB, //MP: pass the volatile structure for NB_IoT protocol params in rlc_am_init.h // warning present
......@@ -3130,7 +3127,7 @@ rlc_op_status_t NB_rrc_rlc_config_req (
LOG_I(RLC, PROTOCOL_CTXT_FMT"[RB %u] MODIFY RB TM\n",
PROTOCOL_CTXT_ARGS(ctxt_pP),
rb_idP);
NB_config_req_rlc_tm( //MP: TM mode configuration
config_req_rlc_tm_NB_IoT( //MP: TM mode configuration
ctxt_pP,
srb_flagP,
&rlc_infoP.rlc.rlc_tm_info,
......@@ -3145,7 +3142,7 @@ rlc_op_status_t NB_rrc_rlc_config_req (
break;
case CONFIG_ACTION_REMOVE:
return NB_rrc_rlc_remove_rlc(ctxt_pP, srb_flagP, rb_idP);
return rrc_rlc_remove_rlc_NB_IoT(ctxt_pP, srb_flagP, rb_idP);
break;
default:
......@@ -3158,8 +3155,7 @@ rlc_op_status_t NB_rrc_rlc_config_req (
//defined in rlc_am.c
//-----------------------------------------------------------------------------
void
NB_config_req_rlc_am (
void config_req_rlc_am_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
rlc_am_info_NB_t * const config_am_pP, //XXX: MP: rlc_am_init.c --> this structure has been modified for NB-IoT
......@@ -3185,7 +3181,7 @@ NB_config_req_rlc_am (
);
rlc_am_init(ctxt_pP, l_rlc_p);
rlc_am_set_debug_infos(ctxt_pP, l_rlc_p, srb_flagP, rb_idP, chan_idP);
NB_rlc_am_configure(ctxt_pP,
rlc_am_configure_NB_IoT(ctxt_pP,
l_rlc_p,
config_am_pP->max_retx_threshold_NB,
config_am_pP->t_poll_retransmit_NB,
......@@ -3199,7 +3195,7 @@ NB_config_req_rlc_am (
//defined in rlc_tm_init.c (nothing to be changed)
//-----------------------------------------------------------------------------
void NB_config_req_rlc_tm (
void config_req_rlc_tm_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rlc_tm_info_t * const config_tmP,
......@@ -3234,7 +3230,7 @@ void NB_config_req_rlc_tm (
}
//defined in rlc_rrc.c
rlc_op_status_t NB_rrc_rlc_remove_ue (
rlc_op_status_t rrc_rlc_remove_ue_NB_IoT (
const protocol_ctxt_t* const ctxt_pP)
{
//-----------------------------------------------------------------------------
......@@ -3243,13 +3239,13 @@ rlc_op_status_t NB_rrc_rlc_remove_ue (
//XXX MP: rb_id = 2 should be not used (SRB2 not defined for NB-IoT)
for (rb_id = 1; rb_id <= 3; rb_id++) {
if(rb_id != 2){
NB_rrc_rlc_remove_rlc(ctxt_pP,
rrc_rlc_remove_rlc_NB_IoT(ctxt_pP,
SRB_FLAG_YES,
rb_id);
}
else
{
LOG_E(RLC, PROTOCOL_CTXT_FMT"[%s %u] NB_rrc_rlc_remove_ue --> removing an UE with rb_id = 2 in NB_IoT!\n",
LOG_E(RLC, PROTOCOL_CTXT_FMT"[%s %u] rrc_rlc_remove_ue_NB_IoT --> removing an UE with rb_id = 2 in NB_IoT!\n",
PROTOCOL_CTXT_ARGS(ctxt_pP), "SRB", rb_id);
}
}
......@@ -3257,12 +3253,12 @@ rlc_op_status_t NB_rrc_rlc_remove_ue (
//XXX possible BUG here???
for (rb_id = 1; rb_id <= maxDRB_NB_r13 + 3; rb_id++) {
if(rb_id != 2){
NB_rrc_rlc_remove_rlc(ctxt_pP,
rrc_rlc_remove_rlc_NB_IoT(ctxt_pP,
SRB_FLAG_NO,
rb_id);
}
else
LOG_E(RLC, PROTOCOL_CTXT_FMT"[%s %u] NB_rrc_rlc_remove_ue --> removing an UE with rb_id = 2 in NB_IoT!\n",
LOG_E(RLC, PROTOCOL_CTXT_FMT"[%s %u] rrc_rlc_remove_ue_NB_IoT --> removing an UE with rb_id = 2 in NB_IoT!\n",
PROTOCOL_CTXT_ARGS(ctxt_pP), "DRB", rb_id);
}
......@@ -3271,7 +3267,7 @@ rlc_op_status_t NB_rrc_rlc_remove_ue (
//defined in rlc_rrc.c --> NO MORE USED PROBABLY
//------------------------------------------------------------------------------
void rrc_rlc_register_rrc_NB (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_t NB_rrc_data_indP, rrc_data_conf_cb_t rrc_data_confP)
{
//his function is called by RRC to register its DATA-INDICATE and DATA-CONFIRM handlers to RLC laye
//map the function pointer to the function in input
......@@ -3285,7 +3281,7 @@ void rrc_rlc_register_rrc_NB (rrc_data_ind_cb_NB_t NB_rrc_data_indP, rrc_data_co
//called by rlc_am_send_sdu and rlc_tm_send_sdu
//defined in rlc.c
//--------------------------------------------
void NB_rlc_data_ind (
void rlc_data_ind_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const srb1bis_flag_t srb1bis_flag,
......@@ -3312,7 +3308,7 @@ void NB_rlc_data_ind (
#endif
NB_pdcp_data_ind (
pdcp_data_ind_NB_IoT (
ctxt_pP,
srb_flagP,
srb1bis_flag,
......@@ -3323,7 +3319,7 @@ void NB_rlc_data_ind (
//defined in rlc.c
//-----------------------------------------------------------------------------
rlc_op_status_t NB_rlc_data_req (const protocol_ctxt_t* const ctxt_pP,
rlc_op_status_t rlc_data_req_NB_IoT (const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rb_id_t rb_idP,
const mui_t muiP,
......@@ -3542,8 +3538,7 @@ rlc_op_status_t NB_rlc_data_req (const protocol_ctxt_t* const ctxt_pP,
//defined in pdcp.c
//if SRB1bis go transparently through PDCP
//--------------------------------------------
boolean_t
NB_pdcp_data_ind(
boolean_t pdcp_data_ind_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const srb1bis_flag_t srb1bis_flag,
......@@ -3767,7 +3762,7 @@ NB_pdcp_data_ind(
PROTOCOL_PDCP_CTXT_ARGS(ctxt_pP, pdcp_p),
sdu_buffer_sizeP - pdcp_header_len - pdcp_tailer_len);
NB_rrc_data_ind(ctxt_pP,
rrc_data_ind_NB_IoT(ctxt_pP,
rb_id,
sdu_buffer_sizeP - pdcp_header_len - pdcp_tailer_len,
(uint8_t*)&sdu_buffer_pP->data[pdcp_header_len],
......@@ -4022,7 +4017,7 @@ NB_pdcp_data_ind(
//-----------------------------------------------------------------------------
//defined in rlc_mac.c
void NB_mac_rlc_data_ind (
void mac_rlc_data_ind_NB_IoT (
const module_id_t module_idP,
const rnti_t rntiP,
const module_id_t eNB_index,
......@@ -4049,7 +4044,7 @@ void NB_mac_rlc_data_ind (
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_MAC_RLC_DATA_IND,VCD_FUNCTION_IN);
if(channel_idP == 2)
LOG_E(RLC, "NB_mac_rlc_data_ind over srb_id invalid (%d)\n", channel_idP);
LOG_E(RLC, "mac_rlc_data_ind_NB_IoT over srb_id invalid (%d)\n", channel_idP);
#ifdef DEBUG_MAC_INTERFACE
......@@ -4103,7 +4098,7 @@ void NB_mac_rlc_data_ind (
break;
case RLC_MODE_AM:
NB_rlc_am_mac_data_indication(&ctxt, &rlc_union_p->rlc.am, data_ind);
rlc_am_mac_data_indication_NB_IoT(&ctxt, &rlc_union_p->rlc.am, data_ind);
break;
//MP: no UM mode for NB_IoT
......@@ -4123,8 +4118,7 @@ void NB_mac_rlc_data_ind (
//-----------------------------------------------------------------------------
//defined in rlc_am.c
void
NB_rlc_am_mac_data_indication (
void rlc_am_mac_data_indication_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
void * const rlc_pP,
struct mac_data_ind data_indP
......@@ -4351,7 +4345,7 @@ NB_rlc_am_mac_data_indication (
//-----------------------------------------------------------------------------
//defined in rlc_mac.c
//called by the schedule_ue_spec for getting SDU to be transmitted from SRB1/SRB1bis and DRBs
tbs_size_t NB_mac_rlc_data_req_eNB(
tbs_size_t mac_rlc_data_req_eNB_NB_IoT(
const module_id_t module_idP,
const rnti_t rntiP,
const eNB_index_t eNB_index,
......@@ -4376,7 +4370,7 @@ tbs_size_t NB_mac_rlc_data_req_eNB(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_MAC_RLC_DATA_REQ,VCD_FUNCTION_IN);
if(channel_idP == 2)
LOG_E(RLC, "NB_mac_rlc_data_req_eNB over srb_id invalid (%d)\n", channel_idP);
LOG_E(RLC, "mac_rlc_data_req_eNB_NB_IoT over srb_id invalid (%d)\n", channel_idP);
#ifdef DEBUG_MAC_INTERFACE
......
openair2/RRC/LITE/proto_NB_IoT.h
View file @ 443af7af
......@@ -41,13 +41,13 @@
/** \brief configure BCCH & CCCH Logical Channels and associated rrc_buffers, configure associated SRBs
*/
void openair_rrc_on_NB(const protocol_ctxt_t* const ctxt_pP);
void openair_rrc_on_NB_IoT(const protocol_ctxt_t* const ctxt_pP);
void rrc_config_buffer_NB(SRB_INFO_NB *srb_info, uint8_t Lchan_type, uint8_t Role);
void rrc_config_buffer_NB_IoT(SRB_INFO_NB *srb_info, uint8_t Lchan_type, uint8_t Role);
int L3_xface_init_NB(void);
int L3_xface_init_NB_IoT(void);
void openair_rrc_top_init_eNB_NB(void);
void openair_rrc_top_init_eNB_NB_IoT(void);
//void rrc_top_cleanup(void); -->seems not to be used
......@@ -58,7 +58,7 @@ void openair_rrc_top_init_eNB_NB(void);
@param enb_index
@param CC_id
*/
RRC_status_t rrc_rx_tx_NB(protocol_ctxt_t* const ctxt_pP, const uint8_t enb_index, const int CC_id);
RRC_status_t rrc_rx_tx_NB_IoT(protocol_ctxt_t* const ctxt_pP, const uint8_t enb_index, const int CC_id);
//long binary_search_int(int elements[], long numElem, int value);--> seems not to be used
//long binary_search_float(float elements[], long numElem, float value);--> used only at UE side
......@@ -67,7 +67,7 @@ RRC_status_t rrc_rx_tx_NB(protocol_ctxt_t* const ctxt_pP, const uint8_t enb_ind
//defined in MAC/config.c
//FIXME: this function has no implication in terms of logical channel configuration for MAC
int NB_rrc_mac_config_req_eNB(
int rrc_mac_config_req_eNB_NB_IoT(
module_id_t Mod_idP,
int CC_idP,
int rntiP,
......@@ -127,7 +127,7 @@ uint8_t is_SIB1_start_NB_IoT(
* called by the NB_mac_rrc_data_req
*
*/
boolean_t is_SIB23_NB(
boolean_t is_SIB23_NB_IoT(
const frame_t frameP,
const frame_t h_frameP, // the HSFN (increased by 1 every SFN wrap around) (10 bits)
long si_period, //SI-periodicity (rf)
......@@ -139,7 +139,7 @@ boolean_t is_SIB23_NB(
//defined in L2_interface
int8_t NB_mac_rrc_data_req_eNB(
int8_t mac_rrc_data_req_eNB_NB_IoT(
const module_id_t Mod_idP,
const int CC_id,
const frame_t frameP,
......@@ -156,7 +156,7 @@ int8_t NB_mac_rrc_data_req_eNB(
//defined in L2_interface
//called by rx_sdu only in case of CCCH message (e.g RRCConnectionRequest-NB)
int8_t NB_mac_rrc_data_ind_eNB(
int8_t mac_rrc_data_ind_eNB_NB_IoT(
const module_id_t module_idP,
const int CC_id,
const frame_t frameP,
......@@ -169,12 +169,12 @@ int8_t NB_mac_rrc_data_ind_eNB(
//-------------------------------------------
//defined in L2_interface
void dump_ue_list_NB(UE_list_NB_IoT_t *listP, int ul_flag);
void dump_ue_list_NB_IoT(UE_list_NB_IoT_t *listP, int ul_flag);
//-------------------------------------------
//defined in L2_interface
void NB_mac_eNB_rrc_ul_failure(
void mac_eNB_rrc_ul_failure_NB_IoT(
const module_id_t mod_idP,
const int CC_idP,
const frame_t frameP,
......@@ -188,7 +188,7 @@ int rrc_mac_remove_ue_NB_IoT(
rnti_t rntiP);
//------------------------------------------
//defined in L2_interface
void NB_mac_eNB_rrc_ul_in_sync(
void mac_eNB_rrc_ul_in_sync_NB_IoT(
const module_id_t mod_idP,
const int CC_idP,
const frame_t frameP,
......@@ -196,15 +196,14 @@ void NB_mac_eNB_rrc_ul_in_sync(
const rnti_t rntiP);
//------------------------------------------
//defined in L2_interface
int NB_mac_eNB_get_rrc_status(
int mac_eNB_get_rrc_status_NB_IoT(
const module_id_t Mod_idP,
const rnti_t rntiP
);
//---------------------------
//----------------------------------------
int
NB_pdcp_apply_security(
int pdcp_apply_security_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
pdcp_t *const pdcp_pP,
const srb_flag_t srb_flagP,
......@@ -219,7 +218,7 @@ NB_pdcp_apply_security(
//XXX for the moment we not configure PDCP for SRB1bis (but used as it is SRB1)
//defined in pdcp.c
boolean_t NB_rrc_pdcp_config_asn1_req (
boolean_t rrc_pdcp_config_asn1_req_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
SRB_ToAddModList_NB_r13_t *const srb2add_list_pP,
DRB_ToAddModList_NB_r13_t *const drb2add_list_pP,
......@@ -235,8 +234,7 @@ boolean_t NB_rrc_pdcp_config_asn1_req (
//defined in pdcp.c --> should be called only by a SRB1 (is internal to PDCP so is not an interface)
//-----------------------------------------------------------------------------
boolean_t
NB_pdcp_config_req_asn1 (
boolean_t pdcp_config_req_asn1_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
pdcp_t * const pdcp_pP,
const srb_flag_t srb_flagP,
......@@ -256,7 +254,7 @@ NB_pdcp_config_req_asn1 (
//defined in L2_interface/pdcp.c
//FIXME SRB1bis should bypass the pdcp
//Distinction between different SRBs will be done by means of rd_id
uint8_t NB_rrc_data_req(
uint8_t rrc_data_req_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const rb_id_t rb_idP,
const mui_t muiP,
......@@ -267,7 +265,7 @@ uint8_t NB_rrc_data_req(
);
//-------------------------------------------------------------
//we distinguish the SRBs based on the logical channel id and the transmission mode
boolean_t NB_pdcp_data_req(
boolean_t pdcp_data_req_NB_IoT(
protocol_ctxt_t* ctxt_pP,
const srb_flag_t srb_flagP, //SRB_FLAG_YES if called by RRC
const rb_id_t rb_idP,
......@@ -281,7 +279,7 @@ boolean_t NB_pdcp_data_req(
//----------------------------------------------------------------
//defined in L2_interface
void NB_rrc_data_ind(
void rrc_data_ind_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const rb_id_t Srb_id,
const sdu_size_t sdu_sizeP,
......@@ -291,7 +289,7 @@ void NB_rrc_data_ind(
//------------------------------------------------------------------------------
//defined in rlc_rrc.c
rlc_op_status_t NB_rrc_rlc_config_asn1_req (
rlc_op_status_t rrc_rlc_config_asn1_req_NB_IoT (
const protocol_ctxt_t * const ctxt_pP,
const SRB_ToAddModList_NB_r13_t * const srb2add_listP,
const DRB_ToAddModList_NB_r13_t * const drb2add_listP,
......@@ -301,7 +299,7 @@ rlc_op_status_t NB_rrc_rlc_config_asn1_req (
//-------------------------------------------------------------------------
// defined in rlc_am.c
void NB_config_req_rlc_am_asn1 (
void config_req_rlc_am_asn1_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const struct RLC_Config_NB_r13__am * const config_am_pP, //extracted from the srb_toAddMod
......@@ -311,8 +309,7 @@ void NB_config_req_rlc_am_asn1 (
//defined in rlc_am_init.c
//------------------------------------------------------------
void
NB_rlc_am_configure(
void rlc_am_configure_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rlc_am_entity_t *const rlc_pP,
const uint16_t max_retx_thresholdP,
......@@ -323,7 +320,7 @@ NB_rlc_am_configure(
//defined in rlc_rrc.c
//-------------------------------------------------------------
rlc_union_t* NB_rrc_rlc_add_rlc (
rlc_union_t* rrc_rlc_add_rlc_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rb_id_t rb_idP,
......@@ -333,7 +330,7 @@ rlc_union_t* NB_rrc_rlc_add_rlc (
//defined in rlc_rrc.c
//--------------------------------------------------------------
rlc_op_status_t NB_rrc_rlc_remove_rlc (
rlc_op_status_t rrc_rlc_remove_rlc_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rb_id_t rb_idP);
......@@ -341,7 +338,7 @@ rlc_op_status_t NB_rrc_rlc_remove_rlc (
//defined in rlc_rrc.c //used only for process_RRCConnectionReconfigurationComplete --> CONFIG_ACTION_REMOVE
//used also for rrc_t310_expiration --> I don't know if it is used (probably not)
rlc_op_status_t NB_rrc_rlc_config_req (
rlc_op_status_t rrc_rlc_config_req_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const config_action_t actionP,
......@@ -352,8 +349,7 @@ rlc_op_status_t NB_rrc_rlc_config_req (
//defined in rlc_am.c
//------------------------------------------------------
void
NB_config_req_rlc_am (
void config_req_rlc_am_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
rlc_am_info_NB_t * const config_am_pP, //XXX: MP: rlc_am_init.c --> this structure has been modified for NB-IoT
......@@ -364,7 +360,7 @@ NB_config_req_rlc_am (
//defined in rlc_tm_init.c (nothing to be changed)
//-----------------------------------------------------------------------------
void NB_config_req_rlc_tm (
void config_req_rlc_tm_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rlc_tm_info_t * const config_tmP,
......@@ -373,13 +369,13 @@ void NB_config_req_rlc_tm (
);
//------------------------------------------------------
//defined in rlc_rrc.c
rlc_op_status_t NB_rrc_rlc_remove_ue (
rlc_op_status_t rrc_rlc_remove_ue_NB_IoT (
const protocol_ctxt_t* const ctxt_pP);
//----------------------------------------------------
//defined in rlc.c
//--------------------------------------------
void NB_rlc_data_ind (
void rlc_data_ind_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const srb1bis_flag_t srb1bis_flag,
......@@ -390,7 +386,7 @@ void NB_rlc_data_ind (
//defined in rlc.c
//-----------------------------------------------------------------------------
rlc_op_status_t NB_rlc_data_req (const protocol_ctxt_t* const ctxt_pP,
rlc_op_status_t rlc_data_req_NB_IoT (const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rb_id_t rb_idP,
const mui_t muiP,
......@@ -402,15 +398,14 @@ rlc_op_status_t NB_rlc_data_req (const protocol_ctxt_t* const ctxt_pP,
//defined in rlc_rrc.c --> NO MORE USED PROBABLY
//------------------------------------------------------------------------------
void rrc_rlc_register_rrc_NB (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_t NB_rrc_data_indP, rrc_data_conf_cb_t rrc_data_confP);
//defined in pdcp.c
//FIXME: should go transparent through the PDCP
//--------------------------------------------
boolean_t
NB_pdcp_data_ind(
boolean_t pdcp_data_ind_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const srb1bis_flag_t srb1bis_flag,
......@@ -421,7 +416,7 @@ NB_pdcp_data_ind(
//---------------------------------------------
//defined in rlc_mac.c
void NB_mac_rlc_data_ind (
void mac_rlc_data_ind_NB_IoT (
const module_id_t module_idP,
const rnti_t rntiP,
const module_id_t eNB_index,
......@@ -436,8 +431,7 @@ void NB_mac_rlc_data_ind (
//-------------------------------------------
//defined in rlc_am.c
void
NB_rlc_am_mac_data_indication (
void rlc_am_mac_data_indication_NB_IoT (
const protocol_ctxt_t* const ctxt_pP,
void * const rlc_pP,
struct mac_data_ind data_indP
......@@ -446,7 +440,7 @@ NB_rlc_am_mac_data_indication (
//defined in rlc_mac.c
//called by the schedule_ue_spec for getting SDU to be transmitted from SRB1/SRB1bis and DRBs
tbs_size_t NB_mac_rlc_data_req_eNB(
tbs_size_t mac_rlc_data_req_eNB_NB_IoT(
const module_id_t module_idP,
const rnti_t rntiP,
const eNB_index_t eNB_index,
......@@ -461,20 +455,17 @@ tbs_size_t NB_mac_rlc_data_req_eNB(
/*-----------eNB procedures (rrc_eNB_nb_iot.c)---------------*/
//---Initialization--------------
void
openair_eNB_rrc_on_NB(
void openair_eNB_rrc_on_NB_IoT(
const protocol_ctxt_t* const ctxt_pP
);
void
rrc_config_buffer_NB(
void rrc_config_buffer_NB_IoT(
SRB_INFO_NB* Srb_info,
uint8_t Lchan_type,
uint8_t Role
);
char
openair_rrc_eNB_configuration_NB(
char openair_rrc_eNB_configuration_NB_IoT(
const module_id_t enb_mod_idP,
RrcConfigurationReq* configuration
);
......@@ -482,13 +473,12 @@ openair_rrc_eNB_configuration_NB(
//-----------------------------
/**\brief RRC eNB task. (starting of the RRC state machine)
\param void *args_p Pointer on arguments to start the task. */
void *rrc_enb_task_NB(void *args_p);
void *rrc_enb_task_NB_IoT(void *args_p);
/**\brief Entry routine to decode a UL-CCCH-Message-NB. Invokes PER decoder and parses message.
\param ctxt_pP Running context
\param Srb_info Pointer to SRB0 information structure (buffer, etc.)*/
int
rrc_eNB_decode_ccch_NB(
int rrc_eNB_decode_ccch_NB_IoT(
protocol_ctxt_t* const ctxt_pP,
const SRB_INFO_NB* const Srb_info,
const int CC_id
......@@ -498,8 +488,7 @@ rrc_eNB_decode_ccch_NB(
\param ctxt_pP Context
\param Rx_sdu Pointer Received Message
\param sdu_size Size of incoming SDU*/
int
rrc_eNB_decode_dcch_NB(
int rrc_eNB_decode_dcch_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const rb_id_t Srb_id,
const uint8_t* const Rx_sdu,
......@@ -510,29 +499,25 @@ rrc_eNB_decode_dcch_NB(
\param ctxt_pP Running context
\param ue_context_pP UE context
\param CC_id Component Carrier ID*/
void
rrc_eNB_generate_RRCConnectionReestablishmentReject_NB(
void rrc_eNB_generate_RRCConnectionReestablishmentReject_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP,
const int CC_id
);
void
rrc_eNB_generate_RRCConnectionReject_NB(
void rrc_eNB_generate_RRCConnectionReject_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP,
const int CC_id
);
void
rrc_eNB_generate_RRCConnectionSetup_NB(
void rrc_eNB_generate_RRCConnectionSetup_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP,
const int CC_id
);
void
rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
void rrc_eNB_process_RRCConnectionReconfigurationComplete_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* ue_context_pP,
const uint8_t xid //transaction identifier
......@@ -540,37 +525,33 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
void //was under ITTI
rrc_eNB_reconfigure_DRBs_NB(const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_reconfigure_DRBs_NB_IoT(const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* ue_context_pP);
void //was under ITTI
rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB(
rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
//no ho state
);
void
rrc_eNB_process_RRCConnectionSetupComplete_NB(
void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* ue_context_pP,
RRCConnectionSetupComplete_NB_r13_IEs_t * rrcConnectionSetupComplete_NB
);
void
rrc_eNB_generate_SecurityModeCommand_NB(
void rrc_eNB_generate_SecurityModeCommand_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
);
void
rrc_eNB_generate_UECapabilityEnquiry_NB(
void rrc_eNB_generate_UECapabilityEnquiry_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
);
void
rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB(const protocol_ctxt_t* const ctxt_pP,
void rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB_IoT(const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
//no HO flag
);
......@@ -578,14 +559,12 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB(const protocol_ctxt_t* c
/// Utilities------------------------------------------------
void
rrc_eNB_free_UE_NB(
void rrc_eNB_free_UE_NB_IoT(
const module_id_t enb_mod_idP,
const struct rrc_eNB_ue_context_NB_s* const ue_context_pP
);
void
rrc_eNB_free_mem_UE_context_NB(
void rrc_eNB_free_mem_UE_context_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
struct rrc_eNB_ue_context_NB_s* const ue_context_pP
);
......@@ -595,7 +574,7 @@ rrc_eNB_free_mem_UE_context_NB(
/**\brief Function to get the next transaction identifier.
\param module_idP Instance ID for CH/eNB
\return a transaction identifier*/
uint8_t rrc_eNB_get_next_transaction_identifier_NB(module_id_t module_idP);
uint8_t rrc_eNB_get_next_transaction_identifier_NB_IoT(module_id_t module_idP);
int rrc_init_global_param_NB_IoT(void);
......
openair2/RRC/LITE/rrc_common_NB_IoT.c
View file @ 443af7af
......@@ -89,7 +89,7 @@ rrc_t310_expiration_NB(
UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
0);
NB_rrc_rlc_config_req(
rrc_rlc_config_req_NB_IoT(
ctxt_pP,
SRB_FLAG_YES,
CONFIG_ACTION_REMOVE,
......@@ -110,10 +110,9 @@ rrc_t310_expiration_NB(
//configure BCCH & CCCH Logical Channels and associated rrc_buffers, configure associated SRBs
//called by openair_rrc_eNB_configuration_NB
//called by openair_rrc_eNB_configuration_NB_IoT
//-----------------------------------------------------------------------------
void
openair_eNB_rrc_on_NB(
void openair_eNB_rrc_on_NB_IoT(
const protocol_ctxt_t* const ctxt_pP
)
//-----------------------------------------------------------------------------
......@@ -124,9 +123,9 @@ openair_eNB_rrc_on_NB(
LOG_I(RRC, PROTOCOL_RRC_CTXT_FMT" OPENAIR RRC-NB IN....\n",
PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
rrc_config_buffer_NB (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].SI, BCCH, 1);
rrc_config_buffer_NB_IoT (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].SI, BCCH, 1);
eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].SI.Active = 1;
rrc_config_buffer_NB (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].Srb0, CCCH, 1);
rrc_config_buffer_NB_IoT (&eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].Srb0, CCCH, 1);
eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].Srb0.Active = 1;
}
//no UE side
......@@ -135,8 +134,7 @@ openair_eNB_rrc_on_NB(
//-----------------------------------------------------------------------------
void
rrc_config_buffer_NB(
void rrc_config_buffer_NB_IoT(
SRB_INFO_NB* Srb_info,
uint8_t Lchan_type,
uint8_t Role
......@@ -157,7 +155,7 @@ int rrc_init_global_param_NB_IoT( void )
{
//may no more used (defined in rlc_rrc.c)
rrc_rlc_register_rrc_NB (NB_rrc_data_ind, NULL); //register with rlc
rrc_rlc_register_rrc_NB_IoT (rrc_data_ind_NB_IoT, NULL); //register with rlc
//XXX MP: most probably ALL of this stuff are no more needed (also the one not commented)
......@@ -172,7 +170,7 @@ int rrc_init_global_param_NB_IoT( void )
#ifndef NO_RRM
if (L3_xface_init_NB ()) { //XXX to be modified???
if (L3_xface_init_NB_IoT ()) { //XXX to be modified???
return (-1);
}
......@@ -185,7 +183,7 @@ if (L3_xface_init_NB ()) { //XXX to be modified???
#ifndef NO_RRM
//-----------------------------------------------------------------------------
int
L3_xface_init_NB( //Exact copy of the LTE implementation
L3_xface_init_NB_IoT( //Exact copy of the LTE implementation
void
)
//-----------------------------------------------------------------------------
......@@ -240,9 +238,8 @@ L3_xface_init_NB( //Exact copy of the LTE implementation
//------------------------------------------------------------------------------
//specialized function for the eNB initialization (NB-IoT)
//(OLD was called in MAC/main.c--> mac_top_init)(NEW is called in directly in "openair_rrc_eNB_configuration_NB")
void
openair_rrc_top_init_eNB_NB(void)//MP: XXX Raymond put this directly the definition on rrc_eNB.c file
//(OLD was called in MAC/main.c--> mac_top_init)(NEW is called in directly in "openair_rrc_eNB_configuration_NB_IoT")
void openair_rrc_top_init_eNB_NB_IoT(void)//MP: XXX Raymond put this directly the definition on rrc_eNB.c file
//-----------------------------------------------------------------------------
{
......@@ -272,7 +269,7 @@ openair_rrc_top_init_eNB_NB(void)//MP: XXX Raymond put this directly the definit
//-----------------------------------------------------------------------------
//XXX MP: most probably is not needed
RRC_status_t
rrc_rx_tx_NB(
rrc_rx_tx_NB_IoT(
protocol_ctxt_t* const ctxt_pP,
const uint8_t enb_indexP,
const int CC_id
......@@ -421,7 +418,7 @@ rrc_rx_tx_NB(
}
}
if (ue_to_be_removed)
rrc_eNB_free_UE_NB(ctxt_pP->module_id,ue_to_be_removed);
rrc_eNB_free_UE_NB_IoT(ctxt_pP->module_id,ue_to_be_removed);
//no localization in NB-IoT
(void)ts; /* remove gcc warning "unused variable" */
......
openair2/RRC/LITE/rrc_eNB_NB_IoT.c
View file @ 443af7af
......@@ -105,15 +105,14 @@ extern void* bigphys_malloc(int);
/*the Message Unit Identifieer (MUI) is an Identity of the RLC SDU, whic is used to indicate which RLC SDU that is confirmed
* with the RLC-AM-Data-conf. e.g. ((struct rlc_am_data_req *) (new_sdu_p->data))->mui (NB_rlc_data_req)
* with the RLC-AM-Data-conf. e.g. ((struct rlc_am_data_req *) (new_sdu_p->data))->mui (rlc_data_req_NB_IoT)
*/
mui_t rrc_eNB_mui_NB = 0;
// should be called when UE is lost by eNB
void
rrc_eNB_free_UE_NB(const module_id_t enb_mod_idP,const struct rrc_eNB_ue_context_NB_s* const ue_context_pP)
void rrc_eNB_free_UE_NB_IoT(const module_id_t enb_mod_idP,const struct rrc_eNB_ue_context_NB_s* const ue_context_pP)
//-----------------------------------------------------------------------------
{
......@@ -187,7 +186,7 @@ rrc_eNB_generate_RRCConnectionRelease_NB(
size = do_RRCConnectionRelease_NB(ctxt_pP->module_id,
buffer,
rrc_eNB_get_next_transaction_identifier_NB(ctxt_pP->module_id));
rrc_eNB_get_next_transaction_identifier_NB_IoT(ctxt_pP->module_id));
// set release timer
ue_context_pP->ue_context.ue_release_timer=1;
// remove UE after 10 frames after RRCConnectionRelease is triggered
......@@ -228,8 +227,7 @@ rrc_eNB_generate_RRCConnectionRelease_NB(
//-----------------------------------------------------------------------------
void
rrc_eNB_generate_RRCConnectionReestablishmentReject_NB(
void rrc_eNB_generate_RRCConnectionReestablishmentReject_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP,
const int CC_id
......@@ -275,8 +273,7 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject_NB(
}
//-----------------------------------------------------------------------------
void
rrc_eNB_free_mem_UE_context_NB(
void rrc_eNB_free_mem_UE_context_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
struct rrc_eNB_ue_context_NB_s* const ue_context_pP
)
......@@ -423,8 +420,7 @@ rrc_eNB_ue_context_stmsi_exist_NB(
}
//-----------------------------------------------------------------------------
uint8_t
rrc_eNB_get_next_transaction_identifier_NB(
uint8_t rrc_eNB_get_next_transaction_identifier_NB_IoT(
module_id_t enb_mod_idP
)
//-----------------------------------------------------------------------------
......@@ -436,8 +432,7 @@ rrc_eNB_get_next_transaction_identifier_NB(
}
//-----------------------------------------------------------------------------
void
rrc_eNB_generate_RRCConnectionReject_NB(
void rrc_eNB_generate_RRCConnectionReject_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP,
const int CC_id
......@@ -482,8 +477,7 @@ rrc_eNB_generate_RRCConnectionReject_NB(
}
//-----------------------------------------------------------------------------
void
rrc_eNB_generate_RRCConnectionSetup_NB(
void rrc_eNB_generate_RRCConnectionSetup_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP,
const int CC_id
......@@ -565,7 +559,7 @@ rrc_eNB_generate_RRCConnectionSetup_NB(
//XXX: Maybe some problem if Connection Setup could be called also after security activation
//configure the MAC for SRB1bis/SRb1 (but in principle this configuration should be not LCID dependent)
NB_rrc_mac_config_req_eNB(
rrc_mac_config_req_eNB_NB_IoT(
ctxt_pP->module_id,
ue_context_pP->ue_context.primaryCC_id,
ue_context_pP->ue_context.rnti,
......@@ -619,8 +613,7 @@ rrc_eNB_generate_RRCConnectionSetup_NB(
}
//-----------------------------------------------------------------------------
void
rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
void rrc_eNB_process_RRCConnectionReconfigurationComplete_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* ue_context_pP,
const uint8_t xid //transaction identifier
......@@ -679,7 +672,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
MSC_AS_TIME_ARGS(ctxt_pP),
ue_context_pP->ue_context.rnti);
NB_rrc_pdcp_config_asn1_req(
rrc_pdcp_config_asn1_req_NB_IoT(
ctxt_pP,
SRB_configList2,
DRB_configList2,
......@@ -692,7 +685,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
DCCH1); //SRB1
// Refresh SRBs/DRBs for RLC
NB_rrc_rlc_config_asn1_req(
rrc_rlc_config_asn1_req_NB_IoT(
ctxt_pP,
SRB_configList2,
DRB_configList2,
......@@ -795,7 +788,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
}
//MP: for each DRB I send a rrc_mac_config_req--> what change is the DRB2LCHAN_NB and logicalChannelConfig_r13
NB_rrc_mac_config_req_eNB(
rrc_mac_config_req_eNB_NB_IoT(
ctxt_pP->module_id,
ue_context_pP->ue_context.primaryCC_id,
ue_context_pP->ue_context.rnti,
......@@ -839,7 +832,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
//MP: The only change w.r.t previous case is that we not put logicalChannelConfig
NB_rrc_mac_config_req_eNB(
rrc_mac_config_req_eNB_NB_IoT(
ctxt_pP->module_id,
ue_context_pP->ue_context.primaryCC_id,
ue_context_pP->ue_context.rnti,
......@@ -875,7 +868,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
void //was under ITTI
// This function triggers the establishment of dedicated bearer in the absence of EPC (oaisim case -- noS1)
// to emulate it only establish 2 bearers (max number for NB-IoT)
rrc_eNB_reconfigure_DRBs_NB(const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_reconfigure_DRBs_NB_IoT(const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* ue_context_pP)
//------------------------------------------------------------------
{
......@@ -908,14 +901,14 @@ rrc_eNB_reconfigure_DRBs_NB(const protocol_ctxt_t* const ctxt_pP,
ue_context_pP->ue_context.setup_e_rabs+=e_rab_done;
//MP: in the case of EPC this function is called directly by S1AP (see rrc_eNB_S1AP.c)
rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB(ctxt_pP, ue_context_pP ); //XXX MP: no ho state
rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB_IoT(ctxt_pP, ue_context_pP ); //XXX MP: no ho state
}
//-----------------------------------------------------------------------------
//uint8_t qci_to_priority[9]={2,4,3,5,1,6,7,8,9};
//-----------------------------------------------------------------------------
void //was under ITTI
rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB(
rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
//no ho state
......@@ -947,7 +940,7 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB(
int e_rab_done=0;
uint8_t xid = rrc_eNB_get_next_transaction_identifier_NB(ctxt_pP->module_id); //Transaction_id,
uint8_t xid = rrc_eNB_get_next_transaction_identifier_NB_IoT(ctxt_pP->module_id); //Transaction_id,
DRB_configList2=&ue_context_pP->ue_context.DRB_configList2[xid];
if (*DRB_configList2) {
......@@ -1129,7 +1122,7 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB(
size);
//transmit the RRCConnectionReconfiguration-NB
NB_rrc_data_req(
rrc_data_req_NB_IoT(
ctxt_pP,
DCCH1,//through SRB1
rrc_eNB_mui_NB++,
......@@ -1141,8 +1134,7 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration_NB(
}
//-----------------------------------------------------------------------------
void
rrc_eNB_process_RRCConnectionSetupComplete_NB(
void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* ue_context_pP,
RRCConnectionSetupComplete_NB_r13_IEs_t * rrcConnectionSetupComplete_NB
......@@ -1171,15 +1163,14 @@ rrc_eNB_process_RRCConnectionSetupComplete_NB(
#endif
{
// RRC loop back (no S1AP), send SecurityModeCommand to UE
rrc_eNB_generate_SecurityModeCommand_NB(
rrc_eNB_generate_SecurityModeCommand_NB_IoT(
ctxt_pP,
ue_context_pP);
}
}
//-----------------------------------------------------------------------------
void
rrc_eNB_generate_SecurityModeCommand_NB(
void rrc_eNB_generate_SecurityModeCommand_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
)
......@@ -1200,7 +1191,7 @@ rrc_eNB_generate_SecurityModeCommand_NB(
size = do_SecurityModeCommand_NB(
ctxt_pP,
buffer,
rrc_eNB_get_next_transaction_identifier_NB(ctxt_pP->module_id),
rrc_eNB_get_next_transaction_identifier_NB_IoT(ctxt_pP->module_id),
ue_context_pP->ue_context.ciphering_algorithm,
ue_context_pP->ue_context.integrity_algorithm);
......@@ -1238,7 +1229,7 @@ rrc_eNB_generate_SecurityModeCommand_NB(
rrc_eNB_mui_NB,
size);
NB_rrc_data_req( //to PDCP
rrc_data_req_NB_IoT( //to PDCP
ctxt_pP,
DCCH0_NB_IoT,//MP:through SRB1bis
rrc_eNB_mui_NB++,
......@@ -1250,8 +1241,7 @@ rrc_eNB_generate_SecurityModeCommand_NB(
}
//-----------------------------------------------------------------------------
void
rrc_eNB_generate_UECapabilityEnquiry_NB(
void rrc_eNB_generate_UECapabilityEnquiry_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
)
......@@ -1293,7 +1283,7 @@ rrc_eNB_generate_UECapabilityEnquiry_NB(
rrc_eNB_mui_NB,
size);
NB_rrc_data_req( //to PDCP
rrc_data_req_NB_IoT( //to PDCP
ctxt_pP,
DCCH1, //MP: send over SRB1
rrc_eNB_mui_NB++,
......@@ -1305,8 +1295,7 @@ rrc_eNB_generate_UECapabilityEnquiry_NB(
}
//-----------------------------------------------------------------------------
void
rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB(const protocol_ctxt_t* const ctxt_pP,
void rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB_IoT(const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_NB_t* const ue_context_pP
//no HO flag
)
......@@ -1349,7 +1338,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB(const protocol_ctxt_t* c
/* for no gcc warnings */
(void)dedicatedInfoNas;
uint8_t xid = rrc_eNB_get_next_transaction_identifier_NB(ctxt_pP->module_id); //Transaction_id,
uint8_t xid = rrc_eNB_get_next_transaction_identifier_NB_IoT(ctxt_pP->module_id); //Transaction_id,
T(T_ENB_RRC_CONNECTION_RECONFIGURATION, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
......@@ -1597,7 +1586,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB(const protocol_ctxt_t* c
rrc_eNB_mui_NB,
size);
NB_rrc_data_req( //to PDCP
rrc_data_req_NB_IoT( //to PDCP
ctxt_pP,
DCCH1,//through SRB1
rrc_eNB_mui_NB++,
......@@ -1723,7 +1712,7 @@ init_SI_NB(
PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
//
NB_rrc_mac_config_req_eNB(ctxt_pP->module_id,
rrc_mac_config_req_eNB_NB_IoT(ctxt_pP->module_id,
CC_id,
0,//rnti
eNB_rrc_inst_NB[ctxt_pP->module_id].carrier[CC_id].physCellId,
......@@ -1759,8 +1748,7 @@ init_SI_NB(
//-----------------------------------------------------------------------------
//aka openair_rrc_eNB_init
char
openair_rrc_eNB_configuration_NB(
char openair_rrc_eNB_configuration_NB_IoT(
const module_id_t enb_mod_idP,
RrcConfigurationReq* configuration //MP: previously was insiede ITTI but actually I put it out
)
......@@ -1817,10 +1805,10 @@ while ( eNB_rrc_inst_NB == NULL ) {
//XXX following the old implementation: openair_rrc_top_init is called in MAC/main.c
//In Rymond version actually is called here
//openair_rrc_top_init_eNB_NB();
//openair_rrc_top_init_eNB_NB_IoT();
//init ch SRB0, SRB1 & BDTCH
openair_eNB_rrc_on_NB(&ctxt);
openair_eNB_rrc_on_NB_IoT(&ctxt);
return 0;
......@@ -1830,8 +1818,7 @@ while ( eNB_rrc_inst_NB == NULL ) {
/*-----------------STATE MACHINE---------------*/
//-----------------------------------------------------------------------------
int
rrc_eNB_decode_ccch_NB(
int rrc_eNB_decode_ccch_NB_IoT(
protocol_ctxt_t* const ctxt_pP,
const SRB_INFO_NB* const Srb_info, //SRB0
const int CC_id
......@@ -1942,7 +1929,7 @@ rrc_eNB_decode_ccch_NB(
/* reject all reestablishment attempts for the moment */
//MP:for the moment we only reject
rrc_eNB_generate_RRCConnectionReestablishmentReject_NB(ctxt_pP,
rrc_eNB_generate_RRCConnectionReestablishmentReject_NB_IoT(ctxt_pP,
rrc_eNB_get_ue_context_NB(&eNB_rrc_inst_NB[ctxt_pP->module_id], ctxt_pP->rnti),
CC_id);
......@@ -1971,7 +1958,7 @@ rrc_eNB_decode_ccch_NB(
if (ue_context_p != NULL) { //MP: i receive a ConnectionRequest from a UE which have already a context
// erase content
rrc_eNB_free_mem_UE_context_NB(ctxt_pP, ue_context_p);
rrc_eNB_free_mem_UE_context_NB_IoT(ctxt_pP, ue_context_p);
MSC_LOG_RX_DISCARDED_MESSAGE(
MSC_RRC_ENB,
......@@ -2066,7 +2053,7 @@ rrc_eNB_decode_ccch_NB(
PROTOCOL_RRC_CTXT_UE_FMT" RRCConnectionRequest-NB without random UE identity or S-TMSI not supported, let's reject the UE\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
rrc_eNB_generate_RRCConnectionReject_NB(ctxt_pP,
rrc_eNB_generate_RRCConnectionReject_NB_IoT(ctxt_pP,
rrc_eNB_get_ue_context_NB(&eNB_rrc_inst_NB[ctxt_pP->module_id], ctxt_pP->rnti),
CC_id);
break;
......@@ -2128,7 +2115,7 @@ rrc_eNB_decode_ccch_NB(
ue_context_p->ue_context.Srb1bis.Srb_info.Srb_id = DCCH0_NB_IoT;
//generate RRCConnectionSetup-NB
rrc_eNB_generate_RRCConnectionSetup_NB(ctxt_pP, ue_context_p, CC_id);
rrc_eNB_generate_RRCConnectionSetup_NB_IoT(ctxt_pP, ue_context_p, CC_id);
LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT"CALLING RLC CONFIG SRB1bis and SRB1 (rbid %d, rbid %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
......@@ -2144,7 +2131,7 @@ rrc_eNB_decode_ccch_NB(
ue_context_p->ue_context.rnti);
//MP: we should not configure PDCP for SRB1bis but only for SRB1
NB_rrc_pdcp_config_asn1_req(ctxt_pP,
rrc_pdcp_config_asn1_req_NB_IoT(ctxt_pP,
ue_context_p->ue_context.SRB_configList, //contain SRB1bis but used as SRB1
(DRB_ToAddModList_NB_r13_t *) NULL,
(DRB_ToReleaseList_NB_r13_t*) NULL,
......@@ -2156,14 +2143,14 @@ rrc_eNB_decode_ccch_NB(
DCCH1);
///MP: Configure RLC for SRB1bis
NB_rrc_rlc_config_asn1_req(ctxt_pP,
rrc_rlc_config_asn1_req_NB_IoT(ctxt_pP,
ue_context_p->ue_context.SRB_configList,
(DRB_ToAddModList_NB_r13_t*) NULL,
(DRB_ToReleaseList_NB_r13_t*) NULL,
SRB1BIS_FLAG_YES
);
//MP: Configure RLC for SRB1
NB_rrc_rlc_config_asn1_req(ctxt_pP,
rrc_rlc_config_asn1_req_NB_IoT(ctxt_pP,
ue_context_p->ue_context.SRB_configList,
(DRB_ToAddModList_NB_r13_t*) NULL,
(DRB_ToReleaseList_NB_r13_t*) NULL,
......@@ -2203,7 +2190,7 @@ rrc_eNB_decode_ccch_NB(
"delay tollerant Access v1330"));
//MP: only reject for now
rrc_eNB_generate_RRCConnectionReject_NB(ctxt_pP,
rrc_eNB_generate_RRCConnectionReject_NB_IoT(ctxt_pP,
rrc_eNB_get_ue_context_NB(&eNB_rrc_inst_NB[ctxt_pP->module_id], ctxt_pP->rnti),
CC_id);
break;
......@@ -2226,8 +2213,7 @@ rrc_eNB_decode_ccch_NB(
}
//-----------------------------------------------------------------------------
int
rrc_eNB_decode_dcch_NB(
int rrc_eNB_decode_dcch_NB_IoT(
const protocol_ctxt_t* const ctxt_pP,
const rb_id_t Srb_id, //Dcch_index
const uint8_t* const Rx_sdu,
......@@ -2344,7 +2330,7 @@ rrc_eNB_decode_dcch_NB(
PROTOCOL_RRC_CTXT_UE_FMT" UE State = RRC_RECONFIGURED (default DRB, xid %ld)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),ul_dcch_msg_NB->message.choice.c1.choice.rrcConnectionReconfigurationComplete_r13.rrc_TransactionIdentifier);
}
rrc_eNB_process_RRCConnectionReconfigurationComplete_NB(
rrc_eNB_process_RRCConnectionReconfigurationComplete_NB_IoT(
ctxt_pP,
ue_context_p,
ul_dcch_msg_NB->message.choice.c1.choice.rrcConnectionReconfigurationComplete_r13.rrc_TransactionIdentifier);
......@@ -2374,7 +2360,7 @@ rrc_eNB_decode_dcch_NB(
#else // MP: not use of MME
//dedicated bearer in the absence of EPC
if (dedicated_DRB == 0 ) {
rrc_eNB_reconfigure_DRBs_NB(ctxt_pP,ue_context_p); //MP: establish a dedicated DRB
rrc_eNB_reconfigure_DRBs_NB_IoT(ctxt_pP,ue_context_p); //MP: establish a dedicated DRB
}
#endif
......@@ -2447,7 +2433,7 @@ rrc_eNB_decode_dcch_NB(
if (ul_dcch_msg_NB->message.choice.c1.choice.rrcConnectionSetupComplete_r13.criticalExtensions.present ==
RRCConnectionSetupComplete_NB__criticalExtensions_PR_rrcConnectionSetupComplete_r13) {
rrc_eNB_process_RRCConnectionSetupComplete_NB(
rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
ctxt_pP,
ue_context_p,
&ul_dcch_msg_NB->message.choice.c1.choice.rrcConnectionSetupComplete_r13.criticalExtensions.choice.rrcConnectionSetupComplete_r13);
......@@ -2522,7 +2508,7 @@ rrc_eNB_decode_dcch_NB(
ue_context_p->ue_context.Srb1bis.Active=0;
rrc_eNB_generate_UECapabilityEnquiry_NB(ctxt_pP, ue_context_p);
rrc_eNB_generate_UECapabilityEnquiry_NB_IoT(ctxt_pP, ue_context_p);
break;
......@@ -2582,14 +2568,14 @@ rrc_eNB_decode_dcch_NB(
//therefore setting securityActivated=0 for the corresponding PDCP entity in the PDCP but still start the usage of SRB1
// pdcp_pP-> security_activated modified (=1) by pdcp_config_set_security in NB_pdcp_config_req_asn1 at configuration time
// pdcp_pP-> security_activated modified (=1) by pdcp_config_set_security in pdcp_config_req_asn1_NB_IoT at configuration time
// we now create a particular case for pdcp_config_set_securityy function in which for a particular securityMode (= -1) we deactivate security.
// we first invoke the NB_rrc_pdcp_config_asn1_req that with the particular case of securityMode = -1 will disable security through the pdcp_config_set_security
// we first invoke the rrc_pdcp_config_asn1_req_NB_IoT that with the particular case of securityMode = -1 will disable security through the pdcp_config_set_security
//MP: the integrity protection is still not used in OAI --> MAC-I is padded always to 0 so no need to modify it
NB_rrc_pdcp_config_asn1_req(
rrc_pdcp_config_asn1_req_NB_IoT(
ctxt_pP,
ue_context_p->ue_context.SRB_configList,
(DRB_ToAddModList_NB_r13_t *)NULL,
......@@ -2602,7 +2588,7 @@ rrc_eNB_decode_dcch_NB(
DCCH1//its only for check purposes (if correctly called could be deleted)
);
rrc_eNB_generate_UECapabilityEnquiry_NB(ctxt_pP, ue_context_p);
rrc_eNB_generate_UECapabilityEnquiry_NB_IoT(ctxt_pP, ue_context_p);
break;
......@@ -2676,7 +2662,7 @@ rrc_eNB_decode_dcch_NB(
ue_context_p->ue_context.setup_e_rabs =ue_context_p->ue_context.nb_of_e_rabs;
#endif
rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB(ctxt_pP, ue_context_p);//no HO_FLAG
rrc_eNB_generate_defaultRRCConnectionReconfiguration_NB_IoT(ctxt_pP, ue_context_p);//no HO_FLAG
break;
......@@ -2779,8 +2765,7 @@ rrc_eNB_decode_dcch_NB(
//-----------------------------------------------------------------------------
//put out from the ITTI FIXME is completely based on ITTI--> must be changed (msg_p, itti_receive_msg ecc...)
void*
rrc_enb_task_NB(
void* rrc_enb_task_NB_IoT(
void* args_p
)
//-----------------------------------------------------------------------------
......@@ -2834,7 +2819,7 @@ rrc_enb_task_NB(
srb_info_p->Rx_buffer.payload_size = RRC_MAC_CCCH_DATA_IND(msg_p).sdu_size;
rrc_eNB_decode_ccch_NB(&ctxt, srb_info_p, CC_id); //SRB0
rrc_eNB_decode_ccch_NB_IoT(&ctxt, srb_info_p, CC_id); //SRB0
break;
......@@ -2850,7 +2835,7 @@ rrc_enb_task_NB(
PROTOCOL_RRC_CTXT_UE_ARGS(&ctxt),
RRC_DCCH_DATA_IND(msg_p).dcch_index,
msg_name_p);
rrc_eNB_decode_dcch_NB(&ctxt,
rrc_eNB_decode_dcch_NB_IoT(&ctxt,
RRC_DCCH_DATA_IND(msg_p).dcch_index, //3 if SRB1bis and 1 for SRB1
RRC_DCCH_DATA_IND(msg_p).sdu_p, //rx_sdu
RRC_DCCH_DATA_IND(msg_p).sdu_size);
......@@ -2903,7 +2888,7 @@ rrc_enb_task_NB(
/* Messages from eNB app */
case RRC_CONFIGURATION_REQ:
LOG_I(RRC, "[eNB %d] Received %s\n", instance, msg_name_p);
openair_rrc_eNB_configuration_NB(ENB_INSTANCE_TO_MODULE_ID(instance), &RRC_CONFIGURATION_REQ(msg_p));
openair_rrc_eNB_configuration_NB_IoT(ENB_INSTANCE_TO_MODULE_ID(instance), &RRC_CONFIGURATION_REQ(msg_p));
break;
default:
......
openair2/RRC/LITE/rrc_eNB_UE_context.c
View file @ 443af7af
......@@ -333,7 +333,7 @@ void rrc_eNB_remove_ue_context_NB(
"0 Removed UE %"PRIx16" ",
ue_context_pP->ue_context.rnti);
rrc_eNB_free_mem_UE_context_NB(ctxt_pP, ue_context_pP);
rrc_eNB_free_mem_UE_context_NB_IoT(ctxt_pP, ue_context_pP);
uid_linear_allocator_free_NB(rrc_instance_pP, ue_context_pP->local_uid);
free(ue_context_pP);
LOG_I(RRC,
......
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