Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
canghaiwuhen
OpenXG-RAN
Commits
63d6b59f
Commit
63d6b59f
authored
4 years ago
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enabled check on UE mode to start either ULSCH and PRACH procedures:
- ULSCH is temporary disabled
parent
d6f597ce
develop
1
128-ues
256_QAM_demod
NCTU_OpinConnect_LDPC
NR-PHY-MAC-IF-multi-UE
NR_10MHz
NR_CSI_reporting
NR_DCI_01
NR_DL_sched_fixes
NR_DL_scheduler
NR_FAPI_beamindex_SSB_RO
NR_FR2_RA
NR_FR2_RRC_SSB
NR_MAC_CE_GlobalEdge
NR_MAC_Multi_Rach_GlobalEdge
NR_MAC_SSB_RO_GlobalEdge
NR_MAC_SSB_RO_UE_IDCC
NR_MAC_SSB_RO_merge
NR_MAC_TCI_UCI_GlobalEdge
NR_NGAP
NR_PDCP_noS1
NR_PUCCH_MultiUE
NR_RA_updates
NR_RRCConfiguration_FR2
NR_RRC_PDCP
NR_RRC_PRACH_procedures
NR_RRC_PRACH_procedures_todevelop
NR_RRC_X2AP_AMBR_Change_Global_edge
NR_RRC_X2AP_RemoveHardcodings_GlobalEdge
NR_RRC_config_simplified
NR_RRC_harq
NR_RRC_harq_hacks
NR_SA_NGAP_RRC
NR_SA_NGAP_RRC_wk42
NR_SA_itti_sim_wk48
NR_SRB_Config
NR_UE_MAC_scheduler
NR_UE_RA_fixes
NR_UE_UL_DCI_improvements
NR_UE_enable_parallelization
NR_UE_stability_fixes
NR_UL_FAPI_programming
NR_UL_scheduler
NR_UL_scheduler_rebased
NR_UL_scheduling
NR_ipaccess_testing
NR_mac_uci_functions_rework
NR_msg2_phytest
NR_scheduling_CSIRS
NR_scheduling_request
NR_test_S1U_RRC_PRACH_procedures
NR_ue_dlsch_dmrs_cdm
PUSCH_TA_update
RA_CI_test
UE_DL_DCI_hotfix
bch-fixes-bitmap
benetel_5g_prach_fix
benetel_phase_rotation
benetel_phase_rotation_old
bugfix-minor-remove-wrong-log
bugfix-nr-bands
bugfix-nr-ldpc-post-processing
bugfix-nr-ldpc-size-typo
bugfix-nr-pdcp-sn-size
bugfix-nr-rate-matching-assertion
cce_indexing_fix
cce_indexing_fix2
ci-deploy-docker-compose
ci-rd-july-improvements
ci-ul-iperf-from-trf-container
clean-5G-scope-round2
cleanup_softmodem_main
constant_power
develop-oriecpriupdates
develop-sib1
dfts_alternatives
dlsch-all-dlslots
dlsch_encode_mthread
dlsch_parallel
dongzhanyi-zte-develop
dongzhanyi-zte-develop2
feature/make-s1-mme-port-configurable
feature/make-s1-mme-port-configurable-with-astyle-fixes
fembms-enb-ue
finalize-oaicn-integration
firas
fix-ci-tun
fix-itti-segv
fix-softmodem-restart
fix_do_ra_data
fix_pdsch_low_prb
fix_rfsim_mimo
fix_rrc_x2_ticking
fixes-mac-sched-nfapi
fixes-mac-sched-tun
fixes-tun
flexran-apps
flexran-repair-mme-mgmt
fujitsu_lte_contribution
fujitsu_lte_contribution-128
harq-hotfix
hotfix-minor-remove-nr-rlc-cppcheck-error
hotfix-nr-rlc-tick
hotfix-ocp-executable
improve_nr_modulation
improve_ue_stability
integration_2020_wk40
integration_2020_wk41
integration_2020_wk42_2
integration_2020_wk45
integration_2020_wk45_2
integration_2020_wk46
integration_2020_wk46_2
integration_2020_wk47
integration_2020_wk48
integration_2020_wk48_2
integration_2020_wk49
integration_2020_wk50
integration_2020_wk50_1
inter-RRU-final
ldpc-decoder-codegen
ldpc-decoder-codegen2
ldpc_short_codeword_fixes
load_gnb
lte_uplink_improvement
mac-fixes-wk45_2
mosaic5g-oai-ran
mosaic5g-oai-sim
nfapi-bugfix
nfapi_nr_develop
ngap-dlul
ngap-support
ngap-w48-merge2
ngap-wf
ngap-wf-1120
ngap-wf-1120-srb
ngap-wf-1120-srb-gtp
ngap-wf-1120-srb-gtp-hs
ngap-wf-1120-srb-gtp-hs1
ngap-wf-1120-srb-gtp-hs2
ngap-wf-1203-yunsdr
ngap-wf-liuyu
ngap_lfq_1120
ngap_merge
noCore
nr-mac-pdu-wireshark
nr-mac-remove-ue-list
nr-rlc-am-bugfix-w44
nr-rlc-bugfix-w44
nrUE
nrUE-hs
nrUE-upper-layer
nr_bsr
nr_dl_dmrs_type2
nr_dl_pf
nr_dl_pf2
nr_dl_ul_ptrs
nr_fdd_if_fix
nr_polar_decoder_improvement
nr_prach_fr2
nr_ue_msg3
nr_ue_tti_cleanup
nrue_msg2_reception
nsa-ue
nsa_remove_band_hardcodings
oai-sim
oc-docker-october-improvements
openxg/develop
polar8
ptrs_rrc_config
pusch-mthread-scaling-fix
ra-dl-ul
remove_nos1_hack_pdcp
remove_x2_gnb_hardcoding
repair-TA
revert_memcpy
rh_ci_fix_autoterminate
rh_ci_fr1_update
rh_ci_oc
rh_ci_py
rh_ci_rfsim_ra
rh_fr1_newjenkins
rh_fr1_update
rh_gnb_compile_fix
rh_wk50_debug
rlc-v2-bugfix-status-reporting
rlc-v2-tick
rrc-enb-phy-testmode
s1_subnormal
s1ap-bugfix-rab_setup
small-bugfixes-w40
smallcleanup
testing_2symb_pdcch
testing_with_external_txdata
tp-ota-test
trx_thread_param
ue-csi
ue-fixes-ota
ul_dl_dci_same_slot
ul_harq
ulsch_decode_mthread
ulsim_changes
x2-endc-processing
yihongzheng_srb
zzs
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+18
-18
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
63d6b59f
...
...
@@ -2243,12 +2243,8 @@ void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
start_meas
(
&
ue
->
phy_proc_tx
);
#endif
nr_ue_ulsch_procedures
(
ue
,
harq_pid
,
frame_tx
,
slot_tx
,
thread_id
,
gNB_id
);
if
(
ue
->
UE_mode
[
gNB_id
]
==
PUSCH
){
nr_ue_ulsch_procedures
(
ue
,
harq_pid
,
frame_tx
,
slot_tx
,
thread_id
,
gNB_id
);
/*
if (ue->UE_mode[eNB_id] == PUSCH) {
...
...
@@ -2266,6 +2262,7 @@ void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
thread_id
,
gNB_id
,
&
ue
->
frame_parms
);
}
/* RACH */
...
...
@@ -2451,7 +2448,7 @@ void restart_phy(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc, uint8_t eNB_id,uint
}
#endif //(0)
void
nr_ue_pbch_procedures
(
uint8_t
e
NB_id
,
void
nr_ue_pbch_procedures
(
uint8_t
g
NB_id
,
PHY_VARS_NR_UE
*
ue
,
UE_nr_rxtx_proc_t
*
proc
,
uint8_t
abstraction_flag
)
...
...
@@ -2470,20 +2467,23 @@ void nr_ue_pbch_procedures(uint8_t eNB_id,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PBCH_PROCEDURES
,
VCD_FUNCTION_IN
);
//LOG_I(PHY,"[UE %d] Frame %d, Trying PBCH %d (NidCell %d,
eNB_id %d)\n",ue->Mod_id,frame_rx,pbch_phase,ue->frame_parms.Nid_cell,e
NB_id);
//LOG_I(PHY,"[UE %d] Frame %d, Trying PBCH %d (NidCell %d,
gNB_id %d)\n",ue->Mod_id,frame_rx,pbch_phase,ue->frame_parms.Nid_cell,g
NB_id);
ret
=
nr_rx_pbch
(
ue
,
proc
,
ue
->
pbch_vars
[
e
NB_id
],
ue
->
pbch_vars
[
g
NB_id
],
&
ue
->
frame_parms
,
e
NB_id
,
g
NB_id
,
(
ue
->
frame_parms
.
ssb_index
)
&
7
,
SISO
,
ue
->
high_speed_flag
);
if
(
ret
==
0
)
{
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors_conseq
=
0
;
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors_conseq
=
0
;
// Switch to PRACH state if it is first PBCH after initial synch and no timing correction is performed
if
(
ue
->
UE_mode
[
gNB_id
]
==
NOT_SYNCHED
&&
ue
->
no_timing_correction
==
1
)
ue
->
UE_mode
[
gNB_id
]
=
PRACH
;
#ifdef DEBUG_PHY_PROC
uint16_t
frame_tx
;
...
...
@@ -2513,25 +2513,25 @@ void nr_ue_pbch_procedures(uint8_t eNB_id,
exit(-1);
*/
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors_conseq
++
;
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors
++
;
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors_conseq
++
;
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors
++
;
if
(
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors_conseq
>=
100
)
{
if
(
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors_conseq
>=
100
)
{
LOG_E
(
PHY
,
"More that 100 consecutive PBCH errors! Exiting!
\n
"
);
exit_fun
(
"More that 100 consecutive PBCH errors! Exiting!
\n
"
);
}
}
if
(
frame_rx
%
100
==
0
)
{
ue
->
pbch_vars
[
eNB_id
]
->
pdu_fer
=
ue
->
pbch_vars
[
eNB_id
]
->
pdu_errors
-
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors_last
;
ue
->
pbch_vars
[
eNB_id
]
->
pdu_errors_last
=
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors
;
ue
->
pbch_vars
[
gNB_id
]
->
pdu_fer
=
ue
->
pbch_vars
[
gNB_id
]
->
pdu_errors
-
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors_last
;
ue
->
pbch_vars
[
gNB_id
]
->
pdu_errors_last
=
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors
;
}
#ifdef DEBUG_PHY_PROC
LOG_D
(
PHY
,
"[UE %d] frame %d, slot %d, PBCH errors = %d, consecutive errors = %d!
\n
"
,
ue
->
Mod_id
,
frame_rx
,
nr_tti_rx
,
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors
,
ue
->
pbch_vars
[
e
NB_id
]
->
pdu_errors_conseq
);
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors
,
ue
->
pbch_vars
[
g
NB_id
]
->
pdu_errors_conseq
);
#endif
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PBCH_PROCEDURES
,
VCD_FUNCTION_OUT
);
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment