Skip to content

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

Removing warnings related to MAC_xface_NB_IoT (119 remaining)

parent ec8a31ea
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 112 deletions
openair1/PHY/LTE_TRANSPORT/dci_tools_NB_IoT.c
View file @ afca7809
......@@ -380,7 +380,7 @@ int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
uint8_t subframe2harq_pid_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8_t subframe)
{
MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
//MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
/*
#ifdef DEBUG_DCI
if (frame_parms->frame_type == TDD)
......
openair1/PHY/LTE_TRANSPORT/ulsch_decoding_NB_IoT.c
View file @ afca7809
......@@ -933,7 +933,7 @@ unsigned int ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
uint8_t Nbundled,
uint8_t llr8_flag)
{
MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
//MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
int16_t *ulsch_llr = eNB->pusch_vars[UE_id]->llr;
NB_IoT_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms;
......
openair2/LAYER2/MAC/extern.h
View file @ afca7809
......@@ -129,10 +129,6 @@ extern DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
extern DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
//NB-IoT---------------------------------
extern eNB_MAC_INST_NB_IoT *eNB_mac_inst_NB_IoT;
extern uint8_t Is_rrc_nb_iot_registered;
......
openair2/LAYER2/MAC/extern_NB_IoT.h
View file @ afca7809
......@@ -80,7 +80,7 @@ extern eNB_DLSCH_INFO_NB_IoT eNB_dlsch_info_NB_IoT[NUMBER_OF_eNB_MAX][MAX_NUM_CC
//#ifndef USER_MODE
extern MAC_xface_NB_IoT *mac_xface_NB_IoT;
// extern RRC_XFACE *Rrc_xface;
// extern RRC_XFACE *Rrc_xface; //// to uncomment when it is used
extern uint8_t Is_rrc_registered;
......
openair2/LAYER2/MAC/vars.h
View file @ afca7809
......@@ -41,11 +41,6 @@
#include "PHY_INTERFACE/defs.h"
#include "COMMON/mac_rrc_primitives.h"
#ifdef NB_IOT
//NB-IoT
eNB_MAC_INST_NB_IoT *eNB_mac_inst_NB_IoT;
IF_Module_t *if_inst;
#endif
const uint32_t BSR_TABLE[BSR_TABLE_SIZE]= {0,10,12,14,17,19,22,26,31,36,42,49,57,67,78,91,
105,125,146,171,200,234,274,321,376,440,515,603,706,826,967,1132,
......@@ -157,12 +152,6 @@ DCI2_5MHz_2A_TDD_t DLSCH_alloc_pdu2;
DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu1E;
//NB-IoT--------------------------------------
eNB_MAC_INST_NB_IoT *eNB_mac_inst_NB_IoT;
//should be utilized in: schedule_RA_NB_IoT,rx_sdu_NB_IoT, mac_top_init_NB_IoT,
uint8_t Is_rrc_nb_iot_registered;
#endif
......
openair2/LAYER2/MAC/vars_NB_IoT.h
View file @ afca7809
......@@ -41,11 +41,12 @@
//#include "PHY_INTERFACE/defs.h"
//#include "COMMON/mac_rrc_primitives.h"
// #ifdef NB_IOT
// //NB-IoT
// eNB_MAC_INST_NB_IoT *eNB_mac_inst_NB_IoT;
// IF_Module_t *if_inst;
// #endif
#ifdef NB_IOT
//NB-IoT
eNB_MAC_INST_NB_IoT *eNB_mac_inst_NB_IoT;
IF_Module_t *if_inst;
#endif
const uint32_t BSR_TABLE_NB_IoT[BSR_TABLE_SIZE_NB_IoT]= {0,10,12,14,17,19,22,26,31,36,42,49,57,67,78,91,
105,125,146,171,200,234,274,321,376,440,515,603,706,826,967,1132,
......@@ -57,6 +58,14 @@ eNB_ULSCH_INFO_NB_IoT eNB_ulsch_info_NB_IoT[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUM
eNB_DLSCH_INFO_NB_IoT eNB_dlsch_info_NB_IoT[NUMBER_OF_eNB_MAX][MAX_NUM_CCs][NUMBER_OF_UE_MAX_NB_IoT]; // eNBxUE = 8x8
MAC_xface_NB_IoT *mac_xface_NB_IoT;
//NB-IoT--------------------------------------
eNB_MAC_INST_NB_IoT *eNB_mac_inst_NB_IoT;
//should be utilized in: schedule_RA_NB_IoT,rx_sdu_NB_IoT, mac_top_init_NB_IoT,
uint8_t Is_rrc_registered_NB_IoT;
#endif
openair2/RRC/LITE/L2_interface_NB_IoT.c
View file @ afca7809
......@@ -1100,7 +1100,7 @@ int8_t mac_rrc_data_req_eNB_NB_IoT(
mib_flag_t mib_flag
)
{
MAC_xface_NB_IoT *mac_xface_NB_IoT;
//MAC_xface_NB_IoT *mac_xface_NB_IoT;
SRB_INFO_NB_IoT *Srb_info;
uint8_t Sdu_size=0;
......@@ -1372,7 +1372,7 @@ int8_t mac_rrc_data_req_NB_IoT(
)
//--------------------------------------------------------------------------
{
MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
//MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
SRB_INFO_NB_IoT *Srb_info;
uint8_t Sdu_size=0;
......@@ -1629,69 +1629,6 @@ int8_t mac_rrc_data_req_NB_IoT(
return(0);
}
//defined in eNB_scheduler_primitives.c
/*
int rrc_mac_remove_ue_NB_IoT(
module_id_t mod_idP,
rnti_t rntiP)
{
int i;
UE_list_NB_IoT_t *UE_list = &eNB_mac_inst_NB_IoT[mod_idP].UE_list;
int UE_id = find_UE_id_NB_IoT(mod_idP,rntiP); //may should be changed
int pCC_id;
if (UE_id == -1) {
printf("MAC: cannot remove UE rnti %x\n", rntiP);
LOG_W(MAC,"rrc_mac_remove_ue_NB_IoT: UE %x not found\n", rntiP);
mac_phy_remove_ue(mod_idP, rntiP); //PHY/defs.h
return 0;
}
pCC_id = UE_PCCID(mod_idP,UE_id);
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_IoT(UE_list,0);
UE_list->active[UE_id] = FALSE;
UE_list->num_UEs--;
// clear all remaining pending transmissions
UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID0] = 0;
UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID1] = 0;
UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID2] = 0;
UE_list->UE_template[pCC_id][UE_id].bsr_info[LCGID3] = 0;
UE_list->UE_template[pCC_id][UE_id].rnti = NOT_A_RNTI;
UE_list->UE_template[pCC_id][UE_id].ul_active = FALSE;
eNB_ulsch_info_NB_IoT[mod_idP][pCC_id][UE_id].rnti = NOT_A_RNTI;
eNB_ulsch_info_NB_IoT[mod_idP][pCC_id][UE_id].status = S_UL_NONE;
eNB_dlsch_info_NB_IoT[mod_idP][pCC_id][UE_id].rnti = NOT_A_RNTI;
eNB_dlsch_info_NB_IoT[mod_idP][pCC_id][UE_id].status = S_DL_NONE;
mac_phy_remove_ue(mod_idP,rntiP); //PHY/defs.h
// check if this has an RA process active
RA_TEMPLATE_NB_IoT *RA_template;
for (i=0;i<RA_PROC_MAX_NB_IoT;i++) {
RA_template = (RA_TEMPLATE_NB_IoT *)&eNB_mac_inst[mod_idP].common_channels[pCC_id].RA_template[i];
if (RA_template->rnti == rntiP){
RA_template->RA_active=FALSE;
RA_template->generate_rar=0;
RA_template->generate_Msg4=0;
RA_template->wait_ack_Msg4=0;
RA_template->timing_offset=0;
RA_template->RRC_timer=20;
RA_template->rnti = 0;
//break;
}
}
return 0;
}
*/
//defined in L2_interface
void mac_eNB_rrc_ul_in_sync_NB_IoT(
......@@ -2448,7 +2385,7 @@ boolean_t pdcp_data_req_NB_IoT(
const pdcp_transmission_mode_t modeP
)
{
MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
//MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
pdcp_t *pdcp_p = NULL;
uint8_t i = 0;
......
openair2/RRC/LITE/rrc_eNB_NB_IoT.c
View file @ afca7809
......@@ -490,7 +490,7 @@ void rrc_eNB_generate_RRCConnectionSetup_NB_IoT(
)
//-----------------------------------------------------------------------------
{
MAC_xface_NB_IoT *mac_xface_NB_IoT;
//MAC_xface_NB_IoT *mac_xface_NB_IoT;
//connection setup involve the establishment of SRB1 and SRB1bis (but srb1bis is established implicitly)
//XXX: this message should go through SRB0 to see this--> uper_encode
//XXX: they are assuming that 2 RLC-AM entities are used for SRB1 and SRB1bis
......@@ -1613,7 +1613,7 @@ static void init_SI_NB_IoT(
)
//-----------------------------------------------------------------------------
{
MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
//MAC_xface_NB_IoT *mac_xface_NB_IoT; //test_xface
/*WE should allocate memory for PHY_Config structure
* is declared in vars_nb_iot.c and put also in the extern_nb_iot
......
openair2/RRC/LITE/rrc_eNB_UE_context_NB_IoT.c
View file @ afca7809
......@@ -38,8 +38,8 @@
#include "msc.h"
//------------------------------------------------------------------------------
void
uid_linear_allocator_init_NB_IoT(
void uid_linear_allocator_init_NB_IoT(
uid_allocator_NB_IoT_t* const uid_pP
)
//------------------------------------------------------------------------------
......@@ -49,8 +49,8 @@ uid_linear_allocator_init_NB_IoT(
//------------------------------------------------------------------------------
uid_t
uid_linear_allocator_new_NB_IoT(
uid_t uid_linear_allocator_new_NB_IoT(
eNB_RRC_INST_NB_IoT* const rrc_instance_pP
)
//------------------------------------------------------------------------------
......@@ -79,16 +79,16 @@ uid_linear_allocator_new_NB_IoT(
}
//------------------------------------------------------------------------------
void
uid_linear_allocator_free_NB_IoT(
eNB_RRC_INST_NB_IoT* rrc_instance_pP,
uid_t uidP
void uid_linear_allocator_free_NB_IoT(
eNB_RRC_INST_NB_IoT* rrc_instance_pP,
uid_t uidP
)
//------------------------------------------------------------------------------
{
unsigned int i = uidP/sizeof(unsigned int)/8;
unsigned int bit = uidP % (sizeof(unsigned int) * 8);
unsigned int value = ~(0x00000001 << bit);
unsigned int i = uidP/sizeof(unsigned int)/8;
unsigned int bit = uidP % (sizeof(unsigned int) * 8);
unsigned int value = ~(0x00000001 << bit);
if (i < UID_LINEAR_ALLOCATOR_BITMAP_SIZE_NB_IoT) {
rrc_instance_pP->uid_allocator.bitmap[i] &= value;
......@@ -98,7 +98,9 @@ uid_linear_allocator_free_NB_IoT(
int rrc_eNB_compare_ue_rnti_id_NB_IoT(
struct rrc_eNB_ue_context_NB_IoT_s* c1_pP, struct rrc_eNB_ue_context_NB_IoT_s* c2_pP)
struct rrc_eNB_ue_context_NB_IoT_s *c1_pP,
struct rrc_eNB_ue_context_NB_IoT_s *c2_pP)
//------------------------------------------------------------------------------
{
if (c1_pP->ue_id_rnti > c2_pP->ue_id_rnti) {
......
targets/RT/USER/lte-enb.c
View file @ afca7809
......@@ -583,7 +583,7 @@ int wait_CCs(eNB_rxtx_proc_t *proc) {
*
* For the moment the NB-IoT implementation foresees a single thread implementation
* */
static inline int NB_rxtx(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_NB_IoT_t *proc, char *thread_name) {
static inline int rxtx_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_NB_IoT_t *proc, char *thread_name) {
//Allocate memory for the structures used by PHY and MAC
UL_IND_t *UL_INFO;
......@@ -700,7 +700,7 @@ static void* eNB_thread_rxtx( void* param ) {
if (eNB->CC_id==0)
{
#ifdef NB_IOT
if(NB_rxtx(eNB_NB_IoT, proc_NB_IoT,thread_name)<0) break;
if(rxtx_NB_IoT(eNB_NB_IoT, proc_NB_IoT,thread_name)<0) break;
#else
if (rxtx(eNB,proc,thread_name) < 0) break;
#endif
......
targets/RT/USER/lte-softmodem.c
View file @ afca7809
......@@ -169,7 +169,7 @@ int otg_enabled;
static LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs];
//NB-IoT
static NB_IoT_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];
......@@ -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_IoT(frame_parms_nb_iot);
set_default_frame_parms_NB_IoT(frame_parms_NB_IoT);
#endif
......@@ -1590,11 +1590,11 @@ int main( int argc, char **argv ) {
LOG_I(PHY,"Set nb_rx_antenna %d , nb_tx_antenna %d \n",frame_parms[CC_id]->nb_antennas_rx, frame_parms[CC_id]->nb_antennas_tx);
#ifdef NB_IOT
frame_parms_nb_iot[CC_id]->nb_antennas_tx = nb_antenna_tx;
frame_parms_nb_iot[CC_id]->nb_antennas_rx = nb_antenna_rx;
frame_parms_nb_iot[CC_id]->nb_antenna_ports_eNB = 1; //initial value overwritten by initial sync later
frame_parms_NB_IoT[CC_id]->nb_antennas_tx = nb_antenna_tx;
frame_parms_NB_IoT[CC_id]->nb_antennas_rx = nb_antenna_rx;
frame_parms_NB_IoT[CC_id]->nb_antenna_ports_eNB = 1; //initial value overwritten by initial sync later
LOG_I(PHY,"[NB-IoT] Set nb_rx_antenna %d , nb_tx_antenna %d \n",frame_parms_nb_iot[CC_id]->nb_antennas_rx, frame_parms_nb_iot[CC_id]->nb_antennas_tx);
LOG_I(PHY,"[NB-IoT] Set nb_rx_antenna %d , nb_tx_antenna %d \n",frame_parms_NB_IoT[CC_id]->nb_antennas_rx, frame_parms_NB_IoT[CC_id]->nb_antennas_tx);
#endif
}
......@@ -1694,7 +1694,7 @@ int main( int argc, char **argv ) {
PHY_vars_eNB_g[0][CC_id] = init_lte_eNB(frame_parms[CC_id],0,frame_parms[CC_id]->Nid_cell,node_function[CC_id],abstraction_flag);
//this is a complementary function for just initialize manage NB_ioT stuff inside the PHY_Vars
#ifdef NB_IOT
//init_lte_eNB_NB(PHY_vars_eNB_g[0][CC_id],frame_parms_nb_iot[CC_id], 0, frame_parms_nb_iot[CC_id]->Nid_cell,node_function[CC_id],abstraction_flag);
//init_lte_eNB_NB(PHY_vars_eNB_g[0][CC_id],frame_parms_NB_IoT[CC_id], 0, frame_parms_NB_IoT[CC_id]->Nid_cell,node_function[CC_id],abstraction_flag);
#endif
PHY_vars_eNB_g[0][CC_id]->ue_dl_rb_alloc=0x1fff;
......
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