Commit 2e577b91 authored by lfarizav's avatar lfarizav

I will change eNB_id to all UE_rrc_inst

parent f77d01bc
...@@ -1116,7 +1116,7 @@ int phy_init_lte_ue(PHY_VARS_UE *ue, ...@@ -1116,7 +1116,7 @@ int phy_init_lte_ue(PHY_VARS_UE *ue,
AssertFatal( ue->n_connected_eNB <= NUMBER_OF_CONNECTED_eNB_MAX, "n_connected_eNB is too large" ); AssertFatal( ue->n_connected_eNB <= NUMBER_OF_CONNECTED_eNB_MAX, "n_connected_eNB is too large" );
// do_ofdm_mod for frequency analysis // do_ofdm_mod for frequency analysis
int do_ofdm_mod = ue->do_ofdm_mod=0; int do_ofdm_mod = ue->do_ofdm_mod=1;
if (do_ofdm_mod==0) if (do_ofdm_mod==0)
{ {
......
...@@ -590,7 +590,7 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t su ...@@ -590,7 +590,7 @@ int is_prach_subframe(LTE_DL_FRAME_PARMS *frame_parms,uint32_t frame, uint8_t su
int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf ) int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf )
{ {
printf("generate_prach: eNB_id %d, UE %d\n",eNB_id, ue->Mod_id);
lte_frame_type_t frame_type = ue->frame_parms.frame_type; lte_frame_type_t frame_type = ue->frame_parms.frame_type;
//uint8_t tdd_config = ue->frame_parms.tdd_config; //uint8_t tdd_config = ue->frame_parms.tdd_config;
uint16_t rootSequenceIndex = ue->frame_parms.prach_config_common.rootSequenceIndex; uint16_t rootSequenceIndex = ue->frame_parms.prach_config_common.rootSequenceIndex;
...@@ -1092,7 +1092,7 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1 ...@@ -1092,7 +1092,7 @@ int32_t generate_prach( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint1
} }
int32_t generate_prach_freq( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf ) int32_t generate_prach_freq( PHY_VARS_UE *ue, uint8_t eNB_id, uint8_t subframe, uint16_t Nf )
{ {
printf("generate_prach_freq: eNB_id %d, UE %d\n",eNB_id,ue->Mod_id);
lte_frame_type_t frame_type = ue->frame_parms.frame_type; lte_frame_type_t frame_type = ue->frame_parms.frame_type;
//uint8_t tdd_config = ue->frame_parms.tdd_config; //uint8_t tdd_config = ue->frame_parms.tdd_config;
uint16_t rootSequenceIndex = ue->frame_parms.prach_config_common.rootSequenceIndex; uint16_t rootSequenceIndex = ue->frame_parms.prach_config_common.rootSequenceIndex;
......
...@@ -1997,7 +1997,7 @@ void prach_procedures(PHY_VARS_eNB *eNB) { ...@@ -1997,7 +1997,7 @@ void prach_procedures(PHY_VARS_eNB *eNB) {
int frame = eNB->proc.frame_prach; int frame = eNB->proc.frame_prach;
uint8_t CC_id = eNB->CC_id; uint8_t CC_id = eNB->CC_id;
int do_ofdm_mod = PHY_vars_UE_g[0][0]->do_ofdm_mod; int do_ofdm_mod = PHY_vars_UE_g[0][0]->do_ofdm_mod;
//printf("prach_procedures: eNB_id %d\n",eNB->Mod_id);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,1); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PRACH_RX,1);
memset(&preamble_energy_list[0],0,64*sizeof(uint16_t)); memset(&preamble_energy_list[0],0,64*sizeof(uint16_t));
memset(&preamble_delay_list[0],0,64*sizeof(uint16_t)); memset(&preamble_delay_list[0],0,64*sizeof(uint16_t));
......
...@@ -1836,7 +1836,7 @@ ue_scheduler( ...@@ -1836,7 +1836,7 @@ ue_scheduler(
const int CC_id) const int CC_id)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
{ {
printf("ue_scheduler: UE %d, eNB_indexp %d, PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id %d \n",module_idP,eNB_indexP,PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id); //printf("ue_scheduler: UE %d, eNB_indexp %d, PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id %d \n",module_idP,eNB_indexP,PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id);
int lcid; // lcid index int lcid; // lcid index
int TTI= 1; int TTI= 1;
int bucketsizeduration = -1; int bucketsizeduration = -1;
...@@ -2029,7 +2029,7 @@ ue_scheduler( ...@@ -2029,7 +2029,7 @@ ue_scheduler(
} }
//Check whether Regular BSR is triggered //Check whether Regular BSR is triggered
if (update_bsr(module_idP,txFrameP, txSubframeP,eNB_indexP) == TRUE) {//eNB_indexP change inside the function, so it is not necessary to change if (update_bsr(module_idP,txFrameP, txSubframeP,eNB_indexP) == TRUE) {//eNB_indexP change inside the function, so it is not necessary to change here
// call SR procedure to generate pending SR and BSR for next PUCCH/PUSCH TxOp. This should implement the procedures // call SR procedure to generate pending SR and BSR for next PUCCH/PUSCH TxOp. This should implement the procedures
// outlined in Sections 5.4.4 an 5.4.5 of 36.321 // outlined in Sections 5.4.4 an 5.4.5 of 36.321
UE_mac_inst[module_idP].scheduling_info.SR_pending= 1; UE_mac_inst[module_idP].scheduling_info.SR_pending= 1;
...@@ -2074,7 +2074,7 @@ ue_scheduler( ...@@ -2074,7 +2074,7 @@ ue_scheduler(
//LOG_D(MAC,"PHR normal operation %d active %d \n", UE_mac_inst[module_idP].scheduling_info.periodicPHR_SF, UE_mac_inst[module_idP].PHR_reporting_active); //LOG_D(MAC,"PHR normal operation %d active %d \n", UE_mac_inst[module_idP].scheduling_info.periodicPHR_SF, UE_mac_inst[module_idP].PHR_reporting_active);
if ((UE_mac_inst[module_idP].scheduling_info.prohibitPHR_SF <= 0) && if ((UE_mac_inst[module_idP].scheduling_info.prohibitPHR_SF <= 0) &&
((mac_xface->get_PL(module_idP,0,eNB_indexP) < UE_mac_inst[module_idP].scheduling_info.PathlossChange_db) ||/*eNB_indexP=0*/ ((mac_xface->get_PL(module_idP,0,eNB_indexP) < UE_mac_inst[module_idP].scheduling_info.PathlossChange_db) ||/*eNB_indexP=0*/
(UE_mac_inst[module_idP].power_backoff_db[/*eNB_indexP*/PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id] > UE_mac_inst[module_idP].scheduling_info.PathlossChange_db))) (UE_mac_inst[module_idP].power_backoff_db[eNB_indexP/*PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id*/] > UE_mac_inst[module_idP].scheduling_info.PathlossChange_db)))
// trigger PHR and reset the timer later when the PHR report is sent // trigger PHR and reset the timer later when the PHR report is sent
{ {
UE_mac_inst[module_idP].PHR_reporting_active = 1; UE_mac_inst[module_idP].PHR_reporting_active = 1;
......
...@@ -1233,7 +1233,7 @@ uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv) ...@@ -1233,7 +1233,7 @@ uint8_t do_RRCConnectionRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv)
#ifdef USER_MODE #ifdef USER_MODE
LOG_D(RRC,"[UE] RRCConnectionRequest Encoded %d bits (%d bytes), ecause %d\n",enc_rval.encoded,(enc_rval.encoded+7)/8,ecause); LOG_D(RRC,"[UE] RRCConnectionRequest Encoded %d bits (%d bytes), ecause %d\n",enc_rval.encoded,(enc_rval.encoded+7)/8,ecause);
#endif #endif
printf("[UE] RRCConnectionRequest Encoded %d bits (%d bytes), ecause %d\n",enc_rval.encoded,(enc_rval.encoded+7)/8,ecause);
return((enc_rval.encoded+7)/8); return((enc_rval.encoded+7)/8);
} }
......
This diff is collapsed.
...@@ -60,6 +60,7 @@ openair_rrc_on( ...@@ -60,6 +60,7 @@ openair_rrc_on(
) )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
//ok
unsigned short i; unsigned short i;
int CC_id; int CC_id;
...@@ -408,7 +409,7 @@ rrc_rx_tx( ...@@ -408,7 +409,7 @@ rrc_rx_tx(
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
{ {
//uint8_t UE_id; //uint8_t UE_id;
printf("rrc_rx_tx: enb_indexP %d\n",enb_indexP); //printf("rrc_rx_tx: enb_indexP %d, ctxt_pP->module_id %d\n",enb_indexP,ctxt_pP->module_id);
int32_t current_timestamp_ms, ref_timestamp_ms; int32_t current_timestamp_ms, ref_timestamp_ms;
struct timeval ts; struct timeval ts;
struct rrc_eNB_ue_context_s *ue_context_p = NULL,*ue_to_be_removed = NULL; struct rrc_eNB_ue_context_s *ue_context_p = NULL,*ue_to_be_removed = NULL;
......
...@@ -102,6 +102,7 @@ void rrc_init_ch_req(unsigned char Mod_id, rrm_init_ch_req_t *smsg) ...@@ -102,6 +102,7 @@ void rrc_init_ch_req(unsigned char Mod_id, rrm_init_ch_req_t *smsg)
void rrc_init_mr_req(unsigned char Mod_id, rrci_init_mr_req_t *smsg) void rrc_init_mr_req(unsigned char Mod_id, rrci_init_mr_req_t *smsg)
{ {
//printf("UE_rrc_inst:\n");NOt
uint16_t Index; uint16_t Index;
MAC_CONFIG_REQ Mac_config_req; MAC_CONFIG_REQ Mac_config_req;
// MAC_MEAS_REQ Mac_meas_req; // MAC_MEAS_REQ Mac_meas_req;
......
...@@ -63,7 +63,7 @@ extern UE_MAC_INST *UE_mac_inst; ...@@ -63,7 +63,7 @@ extern UE_MAC_INST *UE_mac_inst;
void fn_rrc (void) void fn_rrc (void)
{ {
/******************************************************************************/ /******************************************************************************/
//printf("fn_rrc:\n");Not
msg_head_t *Header ; msg_head_t *Header ;
#ifdef USER_MODE #ifdef USER_MODE
char *Data; char *Data;
......
...@@ -841,7 +841,7 @@ static void *UE_thread_rxn_txnp4(void *arg) { ...@@ -841,7 +841,7 @@ static void *UE_thread_rxn_txnp4(void *arg) {
start_meas(&UE->generic_stat); start_meas(&UE->generic_stat);
#endif #endif
if (UE->mac_enabled==1) { if (UE->mac_enabled==1) {
printf("UE_thread_rxn_txnp4: eNB_id %d, common_vars.enb_id %d, UE %d\n",0,PHY_vars_UE_g[UE->Mod_id][0]->common_vars.eNb_id,UE->Mod_id); //printf("UE_thread_rxn_txnp4: eNB_id %d, common_vars.enb_id %d, UE %d\n",0,PHY_vars_UE_g[UE->Mod_id][0]->common_vars.eNb_id,UE->Mod_id);
ret = mac_xface->ue_scheduler(UE->Mod_id, ret = mac_xface->ue_scheduler(UE->Mod_id,
proc->frame_rx, proc->frame_rx,
proc->subframe_rx, proc->subframe_rx,
......
...@@ -1431,6 +1431,7 @@ void do_UL_sig_freq_prach(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB ...@@ -1431,6 +1431,7 @@ void do_UL_sig_freq_prach(channel_desc_t *UE2eNB[NUMBER_OF_UE_MAX][NUMBER_OF_eNB
//for (int i=0;i<NB_UE_INST;i++) //for (int i=0;i<NB_UE_INST;i++)
// Compute RX signal for eNB = eNB_id // Compute RX signal for eNB = eNB_id
for (UE_id=0; UE_id<NB_UE_INST; UE_id++) { for (UE_id=0; UE_id<NB_UE_INST; UE_id++) {
if (PHY_vars_UE_g[UE_id][CC_id]->common_vars.eNb_id!=eNB_id) continue;
lte_frame_type_t frame_type = PHY_vars_UE_g[UE_id][CC_id]->frame_parms.frame_type; lte_frame_type_t frame_type = PHY_vars_UE_g[UE_id][CC_id]->frame_parms.frame_type;
prach_ConfigIndex = PHY_vars_UE_g[UE_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex; prach_ConfigIndex = PHY_vars_UE_g[UE_id][CC_id]->frame_parms.prach_config_common.prach_ConfigInfo.prach_ConfigIndex;
prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type); prach_fmt = get_prach_fmt(prach_ConfigIndex,frame_type);
......
...@@ -1066,6 +1066,7 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void * ...@@ -1066,6 +1066,7 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void *
//count++; //count++;
int ret = nsamps; int ret = nsamps;
int eNB_id = device->Mod_id; int eNB_id = device->Mod_id;
//printf("eNB_id %d\n",eNB_id);
int CC_id = device->CC_id; int CC_id = device->CC_id;
int UE_id = 0; int UE_id = 0;
...@@ -1130,8 +1131,7 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void * ...@@ -1130,8 +1131,7 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void *
if (do_ofdm_mod) if (do_ofdm_mod)
{ {
for (UE_id=0; UE_id<NB_UE_INST; UE_id++){ for (UE_id=0; UE_id<NB_UE_INST; UE_id++){
if (eNB_id!=PHY_vars_UE_g[UE_id][CC_id]->common_vars.eNb_id) if (eNB_id!=PHY_vars_UE_g[UE_id][CC_id]->common_vars.eNb_id) continue;
continue;
if (is_prach_subframe(&PHY_vars_UE_g[UE_id][CC_id]->frame_parms,frame,subframe) && PHY_vars_UE_g[UE_id][CC_id]->generate_prach) if (is_prach_subframe(&PHY_vars_UE_g[UE_id][CC_id]->frame_parms,frame,subframe) && PHY_vars_UE_g[UE_id][CC_id]->generate_prach)
{ {
//clock_t start=clock(); //clock_t start=clock();
......
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