Commit b6a21283 authored by hongzhi's avatar hongzhi

ue enable ul in phy-test

parent 261a7407
...@@ -2954,10 +2954,10 @@ void ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uin ...@@ -2954,10 +2954,10 @@ void ue_pbch_procedures(uint8_t eNB_id,PHY_VARS_UE *ue,UE_rxtx_proc_t *proc, uin
frame_tx += ((int)(ue->pbch_vars[eNB_id]->decoded_output[1]&0xfc)); frame_tx += ((int)(ue->pbch_vars[eNB_id]->decoded_output[1]&0xfc));
frame_tx += pbch_phase; frame_tx += pbch_phase;
if (ue->mac_enabled==1) { //if (ue->mac_enabled==1) {
mac_xface->dl_phy_sync_success(ue->Mod_id,frame_rx,eNB_id, mac_xface->dl_phy_sync_success(ue->Mod_id,frame_rx,eNB_id,
ue->UE_mode[eNB_id]==NOT_SYNCHED ? 1 : 0); ue->UE_mode[eNB_id]==NOT_SYNCHED ? 1 : 0);
} //}
#ifdef EMOS #ifdef EMOS
//emos_dump_UE.frame_tx = frame_tx; //emos_dump_UE.frame_tx = frame_tx;
...@@ -4172,9 +4172,9 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue, ...@@ -4172,9 +4172,9 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
#endif #endif
if (ue->mac_enabled == 1) {
switch (pdsch) { switch (pdsch) {
case PDSCH: case PDSCH:
if (ue->mac_enabled == 1)
mac_xface->ue_send_sdu(ue->Mod_id, mac_xface->ue_send_sdu(ue->Mod_id,
CC_id, CC_id,
frame_rx, frame_rx,
...@@ -4192,6 +4192,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue, ...@@ -4192,6 +4192,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
ue->dlsch_SI[eNB_id]->harq_processes[0]->TBS>>3); ue->dlsch_SI[eNB_id]->harq_processes[0]->TBS>>3);
break; break;
case P_PDSCH: case P_PDSCH:
if (ue->mac_enabled == 1)
mac_xface->ue_decode_p(ue->Mod_id, mac_xface->ue_decode_p(ue->Mod_id,
CC_id, CC_id,
frame_rx, frame_rx,
...@@ -4200,6 +4201,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue, ...@@ -4200,6 +4201,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
ue->dlsch_SI[eNB_id]->harq_processes[0]->TBS>>3); ue->dlsch_SI[eNB_id]->harq_processes[0]->TBS>>3);
break; break;
case RA_PDSCH: case RA_PDSCH:
if (ue->mac_enabled == 1)
process_rar(ue,proc,eNB_id,mode,abstraction_flag); process_rar(ue,proc,eNB_id,mode,abstraction_flag);
break; break;
case PDSCH1: case PDSCH1:
...@@ -4210,7 +4212,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue, ...@@ -4210,7 +4212,7 @@ void ue_dlsch_procedures(PHY_VARS_UE *ue,
LOG_E(PHY,"Shouldn't have PMCH here\n"); LOG_E(PHY,"Shouldn't have PMCH here\n");
AssertFatal(1==0,"exiting"); AssertFatal(1==0,"exiting");
break; break;
}
} }
ue->total_TBS[eNB_id] = ue->total_TBS[eNB_id] + ue->total_TBS[eNB_id] = ue->total_TBS[eNB_id] +
dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS; dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS;
......
...@@ -1303,11 +1303,16 @@ void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) { ...@@ -1303,11 +1303,16 @@ void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) {
frame_parms[CC_id]->phich_config_common.phich_resource = oneSixth; frame_parms[CC_id]->phich_config_common.phich_resource = oneSixth;
frame_parms[CC_id]->phich_config_common.phich_duration = normal; frame_parms[CC_id]->phich_config_common.phich_duration = normal;
// UL RS Config // UL RS Config
frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = 0;//n_DMRS1 set to 0 frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift = 1;//n_DMRS1 set to 0
frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = 0; frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupHoppingEnabled = 1;
frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = 0; frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.sequenceHoppingEnabled = 0;
frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = 0; frame_parms[CC_id]->pusch_config_common.ul_ReferenceSignalsPUSCH.groupAssignmentPUSCH = 0;
frame_parms[CC_id]->pusch_config_common.n_SB = 1;
frame_parms[CC_id]->pusch_config_common.hoppingMode = 0;
frame_parms[CC_id]->pusch_config_common.pusch_HoppingOffset = 0;
frame_parms[CC_id]->pusch_config_common.enable64QAM = 0;
frame_parms[CC_id]->prach_config_common.rootSequenceIndex=22; frame_parms[CC_id]->prach_config_common.rootSequenceIndex=22;
frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig=1; frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.zeroCorrelationZoneConfig=1;
frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_ConfigIndex=0; frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_ConfigIndex=0;
......
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