Commit 7f7e0e1b authored by lfarizav's avatar lfarizav

Multiple RRUs almost done. UEs are connected but not attached to EPC. Issue...

Multiple RRUs almost done. UEs are connected but not attached to EPC. Issue with cellidentity dumpped from SIB1
parent d8ad650f
......@@ -517,7 +517,7 @@ void ue_compute_srs_occasion(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id
{
int Mod_id = ue->Mod_id;
int CC_id = ue->CC_id;
SR_payload = mac_xface->ue_get_SR(Mod_id,
SR_payload = mac_xface->ue_get_SR(Mod_id,//not necessary to change
CC_id,
frame_tx,
eNB_id,
......@@ -1511,7 +1511,7 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
mac_xface->Msg1_transmitted(ue->Mod_id,
ue->CC_id,
frame_tx,
ue->common_vars.eNb_id);
eNB_id);//not necessary to change
}
LOG_I(PHY,"[UE %d][RAPROC] Frame %d, subframe %d: Generating PRACH (eNB %d (ue->common_vars.eNb_id %d)) preamble index %d for UL, TX power %d dBm (PL %d dB), l3msg \n",
......@@ -1575,7 +1575,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
ue->ulsch[eNB_id]->harq_processes[harq_pid]->subframe_scheduling_flag = 1;
if (ue->ulsch[eNB_id]->harq_processes[harq_pid]->round==0)
generate_ue_ulsch_params_from_rar(ue,
generate_ue_ulsch_params_from_rar(ue,//not necessary to change
proc,
eNB_id);
......@@ -1775,7 +1775,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#endif
if (abstraction_flag==0) {
if (ulsch_encoding(ue->prach_resources[eNB_id]->Msg3,
if (ulsch_encoding(ue->prach_resources[eNB_id]->Msg3,//not necessary to change
ue,
harq_pid,
eNB_id,
......@@ -1804,7 +1804,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#endif
if (ue->mac_enabled == 1) {
// signal MAC that Msg3 was sent
mac_xface->Msg3_transmitted(Mod_id,
mac_xface->Msg3_transmitted(Mod_id,//not necessary to change
CC_id,
frame_tx,
eNB_id);
......@@ -1822,7 +1822,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
CC_id,
frame_tx,
subframe_tx,
eNB_id,
ue->common_vars.eNb_id,//changed
ulsch_input_buffer,
input_buffer_length,
&access_mode);
......@@ -1852,7 +1852,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#endif
if (abstraction_flag==0) {
if (ulsch_encoding(ulsch_input_buffer,
if (ulsch_encoding(ulsch_input_buffer,//not necessary to change
ue,
harq_pid,
eNB_id,
......@@ -1881,7 +1881,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
if (abstraction_flag == 0) {
if (ue->mac_enabled==1) {
pusch_power_cntl(ue,proc,eNB_id,1, abstraction_flag);
pusch_power_cntl(ue,proc,eNB_id,1, abstraction_flag);//not necessary to change
ue->tx_power_dBm[subframe_tx] = ue->ulsch[eNB_id]->Po_PUSCH;
}
else {
......@@ -1917,7 +1917,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
&ue->frame_parms,
ue->ulsch[eNB_id]);
for (aa=0; aa<1/*frame_parms->nb_antennas_tx*/; aa++){
generate_drs_pusch(ue,
generate_drs_pusch(ue,//not necessary to change
proc,
eNB_id,
tx_amp,
......@@ -2493,7 +2493,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
Mod_id,frame_tx,subframe_tx,
ue->ulsch[eNB_id]->num_cba_dci[subframe_tx]);
mac_xface->ue_get_sdu(Mod_id,
mac_xface->ue_get_sdu(Mod_id,// changed
CC_id,
frame_tx,
subframe_tx,
......@@ -2703,7 +2703,7 @@ void ue_measurement_procedures(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_RRC_MEASUREMENTS, VCD_FUNCTION_OUT);
if (abstraction_flag==1)
ue->sinr_eff = sinr_eff_cqi_calc(ue, ue->common_vars.eNb_id, subframe_rx);
ue->sinr_eff = sinr_eff_cqi_calc(ue, 0, subframe_rx);
}
......@@ -2725,7 +2725,7 @@ void ue_measurement_procedures(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL, VCD_FUNCTION_OUT);
eNB_id = ue->common_vars.eNb_id;
eNB_id = 0;
if (abstraction_flag == 0) {
if (ue->no_timing_correction==0)
......@@ -3912,7 +3912,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
int *dlsch_errors,
runmode_t mode,
int abstraction_flag) {
printf("ue_dlsch_procedures: eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1);
int harq_pid;
int frame_rx = proc->frame_rx;
int subframe_rx = proc->subframe_rx;
......
......@@ -376,7 +376,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP,int CC_id,frame_t frameP,
UE_mac_inst[module_idP].RA_backoff_frame = frameP;
UE_mac_inst[module_idP].RA_backoff_subframe = subframeP;
// Fill in preamble and PRACH resource
get_prach_resources(module_idP,CC_id,eNB_indexP,subframeP,1,NULL);
get_prach_resources(module_idP,CC_id,eNB_indexP,subframeP,1,NULL);//not necessary change eNB_indexP by PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id
generate_ulsch_header((uint8_t*)&UE_mac_inst[module_idP].CCCH_pdu.payload[0], // mac header
1, // num sdus
......
......@@ -66,7 +66,7 @@
#include "assertions.h"
#include "SIMULATION/TOOLS/defs.h" // for taus
#include "PHY/extern.h"
#define DEBUG_HEADER_PARSING 1
#define ENABLE_MAC_PAYLOAD_DEBUG 1
......@@ -460,7 +460,7 @@ ue_send_sdu(
(uint8_t*)payload_ptr,
rx_lengths[i],
ENB_FLAG_NO,
eNB_index,
/*eNB_index*/PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id,//changed
0);
//printf("1\n");
......@@ -468,7 +468,7 @@ ue_send_sdu(
LOG_D(MAC,"[UE %d] Frame %d : DLSCH -> DL-DCCH%d, RRC message (eNB %d, %d bytes)\n", module_idP, frameP, rx_lcids[i],eNB_index,rx_lengths[i]);
mac_rlc_data_ind(module_idP,
UE_mac_inst[module_idP].crnti,
eNB_index,
/*eNB_index*/PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id,//changed
frameP,
ENB_FLAG_NO,
MBMS_FLAG_NO,
......@@ -490,7 +490,7 @@ ue_send_sdu(
#endif
mac_rlc_data_ind(module_idP,
UE_mac_inst[module_idP].crnti,
eNB_index,
/*eNB_index*/PHY_vars_UE_g[module_idP][0]->common_vars.eNb_id,//changed
frameP,
ENB_FLAG_NO,
MBMS_FLAG_NO,
......
......@@ -409,7 +409,7 @@ uint8_t do_SIB1(uint8_t Mod_id, int CC_id,
#endif
)
{
printf("do_SIB1\n");
// SystemInformation_t systemInformation;
PLMN_IdentityInfo_t PLMN_identity_info;
MCC_MNC_Digit_t dummy_mcc[3],dummy_mnc[3];
......
......@@ -2705,7 +2705,7 @@ int decode_BCCH_DLSCH_Message(
# endif
#endif
if (bcch_message->message.present == BCCH_DL_SCH_MessageType_PR_c1) {
printf("Before SIB1: bcch_message->message.choice.c1.present %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1 %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformation %d, id %d, frame %d, CASE %s\n",bcch_message->message.choice.c1.present,BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1,BCCH_DL_SCH_MessageType__c1_PR_systemInformation,ctxt_pP->module_id,ctxt_pP->frame, ((ctxt_pP->frame % 2) == 0&&((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 0) )?"SIB1":((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 1)?"SIB2":"Other case");
printf("Before SIB1: bcch_message->message.choice.c1.present %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1 %d, BCCH_DL_SCH_MessageType__c1_PR_systemInformation %d, id %d, frame %d, CASE %s, eNB_index %d\n",bcch_message->message.choice.c1.present,BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1,BCCH_DL_SCH_MessageType__c1_PR_systemInformation,ctxt_pP->module_id,ctxt_pP->frame, ((ctxt_pP->frame % 2) == 0&&((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 0) )?"SIB1":((UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIStatus&1) == 1)?"SIB2":"Other case",eNB_index);
switch (bcch_message->message.choice.c1.present) {
case BCCH_DL_SCH_MessageType__c1_PR_systemInformationBlockType1:
if ((ctxt_pP->frame % 2) == 0) {
......@@ -2801,7 +2801,7 @@ static int decode_SIB1( const protocol_ctxt_t* const ctxt_pP, const uint8_t eNB_
SystemInformationBlockType1_t* sib1 = UE_rrc_inst[ctxt_pP->module_id].sib1[eNB_index];
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_UE_DECODE_SIB1, VCD_FUNCTION_IN );
printf("Dumping sib1: eNB_index %d\n",eNB_index);
LOG_I( RRC, "[UE %d] : Dumping SIB 1\n", ctxt_pP->module_id );
PLMN_Identity_t *PLMN_identity = &sib1->cellAccessRelatedInfo.plmn_IdentityList.list.array[0]->plmn_Identity;
......
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