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
ZhouShuya
OpenXG-RAN
Commits
63c02302
Commit
63c02302
authored
5 years ago
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
du in 2 threads, and fix UL in FS6 split
parent
283fed9c
dev
1
128-ues
256_QAM_demod
Fix_SA_SIB1
NCTU_OpinConnect_LDPC
NR-PHY-MAC-IF-multi-UE
NRPRACH_highSpeed_saankhya
NRUE_usedlschparallel
NR_10MHz
NR_CSI_reporting
NR_DCI_01
NR_DLUL_PF
NR_DLUL_PF_4UL
NR_DLUL_PF_rebased
NR_DL_MIMO
NR_DL_sched_fixes
NR_DL_scheduler
NR_FAPI_beamindex_SSB_RO
NR_FAPI_beamindex_SSB_RO_SEMPROJ
NR_FDD_FIX
NR_FR2_RA
NR_FR2_RRC_SSB
NR_FR2_initsync_fixes
NR_MAC_CE_GlobalEdge
NR_MAC_Multi_Rach_GlobalEdge
NR_MAC_Multi_Rach_GlobalEdge-old
NR_MAC_SSB
NR_MAC_SSB_RO_GlobalEdge
NR_MAC_SSB_RO_UE_IDCC
NR_MAC_SSB_RO_merge
NR_MAC_TCI_UCI_GlobalEdge
NR_MCS_BLER
NR_NGAP
NR_PUCCH_MultiUE
NR_RA_cleanup
NR_RA_updates
NR_RRCConfiguration_FR2
NR_RRC_PDCP
NR_RRC_PRACH_procedures
NR_RRC_X2AP_AMBR_Change_Global_edge
NR_RRC_X2AP_RemoveHardcodings_GlobalEdge
NR_RRC_config_simplified
NR_RRC_harq_b
NR_SA_F1AP_5GRECORDS
NR_SA_F1AP_5GRECORDS_lts
NR_SA_F1AP_RFSIMULATOR
NR_SA_F1AP_RFSIMULATOR2
NR_SA_F1AP_RFSIMULATOR2_SRB
NR_SA_F1AP_RFSIMULATOR3
NR_SA_F1AP_RFSIMULATOR3_tmp
NR_SA_F1AP_RFSIMULATOR3_wf
NR_SA_F1AP_RFSIMULATOR_w5GCN
NR_SA_F1AP_dev
NR_SA_NGAP_RRC
NR_SA_NGAP_RRC_wk42
NR_SA_itti_sim_wk48
NR_SA_itti_sim_wk48_hs
NR_SA_itti_sim_wk48_hs1
NR_SA_w5GCN_new_gtpu
NR_SCHED_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ_rebased
NR_SCHED_fixes
NR_SRB_Config
NR_UE_CONFIG_REQ_FIXES
NR_UE_MAC_scheduler
NR_UE_RA_fixes
NR_UE_SA
NR_UE_UL_DCI_improvements
NR_UE_dlsch_bugfix
NR_UE_enable_parallelization
NR_UE_stability_fixes
NR_UL_FAPI_programming
NR_UL_SCFDMA_100MHz
NR_UL_scheduler
NR_UL_scheduler_rebased
NR_UL_scheduling
NR_Wireshark
NR_beam_simulation
NR_cleanup_PUCCH_resources
NR_ipaccess_testing
NR_mac_uci_functions_rework
NR_msg2_phytest
NR_multiplexing_HARQ_CSI_PUCCH
NR_scheduling_CSIRS
NR_scheduling_request
NR_scheduling_request2
NR_scheduling_request3
NR_ue_dlsch_dmrs_cdm
PBCHNRTCFIX
PUSCH_TA_update
RA_CI_test
RFquality
Saankhya_NRPRACH_HighSpeed
UE_DL_DCI_hotfix
add-dmrs-test
bch-fixes-bitmap
benetel_5g_prach_fix
benetel_config_file_fix
benetel_driver_uldl_pf_merge
benetel_driver_update
benetel_fixes
benetel_phase_rotation
benetel_phase_rotation_old
bsr-fix
bugfix-free-ra-process
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
bugfix-nr-t-reordering
bugfix-x2-SgNBAdditionRequest
bugfix_gnb_rt_stats_html
bupt-sa-merge
cce_indexing_fix
cce_indexing_fix2
ci-deploy-asterix
ci-deploy-docker-compose
ci-new-docker-pipeline
ci-rd-july-improvements
ci-reduce-nb-vms
ci-test
ci-ul-iperf-from-trf-container
ci_benetel_test
ci_phytest
ci_quectel_support
ci_test_nsa_fix_quectel_nic
ci_test_ra_fr2
ci_vm_resource_fix
clean-5G-scope-round2
cleanup_softmodem_main
constant_power
detached-w16-test
develop
develop-CBRA-v3
develop-CCE
develop-NR_SA_F1AP_5GRECORDS
develop-NR_SA_F1AP_5GRECORDS-hs
develop-NR_SA_F1AP_5GRECORDS-v3
develop-SA-CBRA
develop-SA-CBRA-CUDU
develop-SA-CBRA-Msg5
develop-SA-CBRA-lts
develop-SA-CBRA-ulsch-lts
develop-SA-RA
develop-SnT
develop-oriecpriupdates
develop-sib1
develop-sib1-local
develop-sib1-lts
develop-sib1-update
develop-sib1-update-test1
develop-sib1-update-ue
develop_inria_ci_deployment
develop_inria_ci_deployment_gp
develop_integration_2020_w19
develop_stable
dfts_alternatives
disable_CSI_measrep
dlsch-all-dlslots
dlsch_encode_mthread
dlsch_parallel
docker-improvements-2021-april
docker-no-cache-option
dongzhanyi-zte-develop
dongzhanyi-zte-develop2
enhance-rfsim
episys-merge
episys/nsa_baseline
episys/nsa_development
feature/make-s1-mme-port-configurable
feature/make-s1-mme-port-configurable-with-astyle-fixes
fembms-enb-ue
fft_bench_hotfix
finalize-oaicn-integration
firas
fix-ci-tun
fix-itti-segv
fix-nr-pdcp-timer
fix-nr-rlc-range-nack
fix-physim-deploy
fix-quectel
fix-realtime
fix-softmodem-restart
fix-warnings
fix-x2-without-gnb
fix_NR_DLUL_PF
fix_NR_DLUL_PF_benchmark
fix_coreset_dmrs_idx
fix_do_ra_data
fix_nr_ulsim
fix_pdsch_low_prb
fix_rb_corruption
fix_reestablishment
fix_rfsim_mimo
fix_rrc_x2_ticking
fixes-CE-RLC-PDU-size
fixes-mac-sched-nfapi
fixes-mac-sched-tun
fixes-tun
fixgtpu
flexran-apps
flexran-repair-mme-mgmt
fujitsu_lte_contribution
fujitsu_lte_contribution-128
git-dashboard
gnb-freerun-txru
gnb-n300-fixes
gnb-only-test
gnb-realtime-hotfix
gnb-realtime-quickfix
gnb-threadpool
hack-exit-gnb-when-no-enb-nsa
harq-hotfix
hotfix-minor-remove-nr-rlc-cppcheck-error
hotfix-nr-rlc-tick
hotfix-ocp-executable
hotfix-ue-musim-compilation
improve_nr_modulation
improve_ue_stability
integ-w13-test-rt-issue
integration_2020_wk15
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
integration_2020_wk51
integration_2020_wk51_2
integration_2021_wk02
integration_2021_wk02_wMR988
integration_2021_wk04
integration_2021_wk05
integration_2021_wk06
integration_2021_wk06_MR978
integration_2021_wk06_b
integration_2021_wk06_c
integration_2021_wk08
integration_2021_wk08_2
integration_2021_wk08_MR963
integration_2021_wk09
integration_2021_wk09_b
integration_2021_wk10
integration_2021_wk10_b
integration_2021_wk11
integration_2021_wk12
integration_2021_wk12_b
integration_2021_wk13_a
integration_2021_wk13_b
integration_2021_wk13_b_fix_tdas
integration_2021_wk13_b_fixed
integration_2021_wk13_c
integration_2021_wk14_a
integration_2021_wk15_a
integration_2021_wk16
integration_2021_wk17_a
integration_2021_wk17_b
integration_2021_wk18_a
integration_2021_wk18_b
integration_2021_wk19
integration_w5GC_CBRA_test
inter-RRU-final
inter-RRU-oairu
inter-rru-UE
itti-enhancement
ldpc-decoder-codegen
ldpc-decoder-codegen2
ldpc-offload
ldpc_short_codeword_fixes
load_gnb
lte-ulsch-bugfix
lte_uplink_improvement
mac-fixes-wk45_2
migrate-cpp-check-container
minor-fix-doc-basic-sim
mosaic5g-oai-ran
mosaic5g-oai-sim
msg4_phy_0303_lfq
multiple_ssb_sib1_bugfix
nasmesh_kernel_5.8
new-gtpu
nfapi-bugfix
nfapi_nr_arch_mod
nfapi_nr_develop
nfapi_nr_develop_new
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-1120-srb-gtp-yhz
ngap-wf-1203-yunsdr
ngap-wf-liuyu
ngap_lfq_1120
ngap_merge
noCore
nr-bsr-fix
nr-dl-mimo-2layer
nr-dmrs-fixes
nr-mac-pdu-wireshark
nr-mac-remove-ue-list
nr-pdcp-improvements
nr-pdcp-nea2-security
nr-pdcp-nia2-integrity
nr-pdcp-srb-integrity
nr-ra-fix
nr-rlc-am-bugfix-w44
nr-rlc-bugfix-w44
nr-stats-print
nrPBCHTCFix
nrPbchTcFix
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_power_measurement_fixes
nr_prach_fr2
nr_ue_msg3
nr_ue_pdcp_fix
nr_ue_tti_cleanup
nr_ul_pf
nr_ul_scfdma
nrue_msg2_reception
nsa-ue
nsa_remove_band_hardcodings
oai-sim
oairu
oairu-dockerfile-support
oc-docker-october-improvements
openxg/develop
pdcp-benchmark
physim-build-deploy
physim-deploy-handle-error-cases
polar8
prb_based_dl_channel_estimation
ptrs_rrc_config
pusch-mthread-scaling-fix
pusch-retrans-fix-ue
ra-dl-ul
recursive-cmake
remove_nos1_hack_pdcp
remove_x2_gnb_hardcoding
repair-TA
revert_memcpy
rh-ci-add-ue-parallelization
rh_ci_add_runtime_stats
rh_ci_add_uldlharq_stats
rh_ci_fix_autoterminate
rh_ci_fr1_update
rh_ci_gsheet_rt_monitoring
rh_ci_nsa2jenkins
rh_ci_nsa_test_n310
rh_ci_oc
rh_ci_phy_test_improve
rh_ci_py
rh_ci_ra_fr2
rh_ci_rfsim_ra
rh_ci_test_benetel
rh_ci_test_nsa
rh_ci_test_nsa_wk16
rh_ci_test_nsa_wk17_b
rh_ci_test_nsa_wk17b
rh_ci_ue_parallel
rh_doc_update_3
rh_fr1_newjenkins
rh_fr1_update
rh_gnb_compile_fix
rh_wk50_debug
rlc-v2-bugfix-status-reporting
rlc-v2-tick
rlc_v2_coverity_fixes
rohan_ulsim2RxFix
rrc-enb-phy-testmode
s1-subnormal_rewrite
s1_subnormal
s1_subnormal-robert
s1ap-bugfix-rab_setup
sa-demo
sa-demo-hs
sa-merge-rrc-srb
sa-msg4
sa-msg4-rrc
sa-msg4-rrc-yihz
sa-msg4-rrc-yihz-hs
sa_rrc_yihz
sanitize-address
sanitize-v1
sanitize-v1-tmp
sarma_pvnp_oai
sim-channels
small-bugfixes-w40
small-config-change
small_nr_bugfixes
smallcleanup
split73
t-gnb-tracer
test-panos
test_nsa_gtpu_fix
test_rt-fix_phy-test
testing_2symb_pdcch
testing_with_external_txdata
tp-ota-test
trx_thread_param
ue-csi
ue-dci-false-detection
ue-fixes
ue-fixes-ota
ue-pdsch-pusch-parallel
ue-race-fix
ue_beam_selection
ul-freq-iq-samps-to-file
ul_dl_dci_same_slot
ul_harq
ulsch_decode_mthread
ulsim_changes
usrp_fix_adc_shift_and_pps_sync
usrp_stop_cleanly
usrp_x400
wf-sa-rrc
wireshark-T-hack-ueid
wireshark-log-scheduling-requests
wk11-with-phytest
x2-endc-processing
xiangwab
xiangwan
xw2
yihongzheng_srb
zzs
2021.wk14_a
2021.wk13_d
2021.wk13_c
2021.w18_b
2021.w18_a
2021.w17_b
2021.w16
2021.w15
2021.w14
2021.w13_a
2021.w12
2021.w11
2021.w10
2021.w09
2021.w08
2021.w06
2021.w05
2021.w04
2021.w02
2020.w51_2
2020.w51
2020.w50
2020.w49
2020.w48_2
2020.w48
2020.w47
2020.w46_2
2020.w46
2020.w45_2
2020.w45
2020.w44
2020.w42_2
2020.w42
2020.w41
2020.w39
2020.w38
2020.w37
2020.w36
2020.w34
2020.w33
2020.w31
2020.w30
2020.w29
2020.w28
2020.w26
2020.w25
2020.w24
2020.w23
2020.w22
2020.w19
2020.w17
benetel_phase_rotation
benetel_gnb_rel_2.0
benetel_gnb_rel_1.0
benetel_enb_rel_2.0
benetel_enb_rel_1.0
No related merge requests found
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
85 additions
and
73 deletions
+85
-73
common/utils/ocp_itti/intertask_interface.h
common/utils/ocp_itti/intertask_interface.h
+1
-1
executables/main-fs6.c
executables/main-fs6.c
+38
-41
executables/main-ocp.c
executables/main-ocp.c
+37
-25
executables/split_headers.h
executables/split_headers.h
+4
-2
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+4
-3
targets/COMMON/create_tasks.c
targets/COMMON/create_tasks.c
+1
-1
No files found.
common/utils/ocp_itti/intertask_interface.h
View file @
63c02302
...
@@ -285,7 +285,7 @@ typedef struct {
...
@@ -285,7 +285,7 @@ typedef struct {
TASK_DEF(TASK_PDCP_ENB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_PDCP_ENB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_DATA_FORWARDING, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_DATA_FORWARDING, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_END_MARKER, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_END_MARKER, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_RRC_ENB, TASK_PRIORITY_MED, 200,
NULL
,NULL)\
TASK_DEF(TASK_RRC_ENB, TASK_PRIORITY_MED, 200,
rrc_enb_process_itti_msg
,NULL)\
TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_RAL_ENB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_X2AP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_X2AP, TASK_PRIORITY_MED, 200, NULL, NULL) \
...
...
This diff is collapsed.
Click to expand it.
executables/main-fs6.c
View file @
63c02302
...
@@ -1384,11 +1384,12 @@ void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rx
...
@@ -1384,11 +1384,12 @@ void phy_procedures_eNB_TX_tosplit(uint8_t *bufferZone, PHY_VARS_eNB *eNB, L1_rx
return
;
return
;
}
}
void
DL_du_fs6
(
void
*
arg
)
{
void
*
DL_du_fs6
(
void
*
arg
)
{
RU_t
*
ru
=
*
(
RU_t
*
*
)
arg
;
RU_t
*
ru
=
(
RU_t
*
)
arg
;
static
uint64_t
lastTS
;
static
uint64_t
lastTS
;
L1_rxtx_proc_t
L1_proc
=
{
0
};
L1_rxtx_proc_t
L1_proc
=
{
0
};
while
(
1
)
{
for
(
int
i
=
0
;
i
<
ru
->
num_eNB
;
i
++
)
{
for
(
int
i
=
0
;
i
<
ru
->
num_eNB
;
i
++
)
{
initBufferZone
(
bufferZone
);
initBufferZone
(
bufferZone
);
initStaticTime
(
begingWait
);
initStaticTime
(
begingWait
);
...
@@ -1414,9 +1415,12 @@ void DL_du_fs6(void *arg) {
...
@@ -1414,9 +1415,12 @@ void DL_du_fs6(void *arg) {
feptx_prec
(
ru
,
&
L1_proc
);
feptx_prec
(
ru
,
&
L1_proc
);
feptx_ofdm
(
ru
,
&
L1_proc
);
feptx_ofdm
(
ru
,
&
L1_proc
);
tx_rf
(
ru
,
&
L1_proc
);
tx_rf
(
ru
,
&
L1_proc
);
}
return
NULL
;
}
}
void
UL_du_fs6
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
,
int
frame
,
int
subframe
)
{
void
UL_du_fs6
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
)
{
initStaticTime
(
begingWait
);
initStaticTime
(
begingWait
);
initRefTimes
(
fullLoop
);
initRefTimes
(
fullLoop
);
pickStaticTime
(
begingWait
);
pickStaticTime
(
begingWait
);
...
@@ -1560,7 +1564,7 @@ void *du_fs6(void *arg) {
...
@@ -1560,7 +1564,7 @@ void *du_fs6(void *arg) {
fill_rf_config
(
ru
,
ru
->
rf_config_file
);
fill_rf_config
(
ru
,
ru
->
rf_config_file
);
init_frame_parms
(
&
ru
->
frame_parms
,
1
);
init_frame_parms
(
&
ru
->
frame_parms
,
1
);
phy_init_RU
(
ru
);
phy_init_RU
(
ru
);
openair0_device_load
(
&
ru
->
rfdevice
,
&
ru
->
openair0_cfg
);
init_rf
(
ru
);
wait_sync
(
"ru_thread"
);
wait_sync
(
"ru_thread"
);
char
*
remoteIP
;
char
*
remoteIP
;
...
@@ -1570,33 +1574,26 @@ void *du_fs6(void *arg) {
...
@@ -1570,33 +1574,26 @@ void *du_fs6(void *arg) {
remoteIP
=
CU_IP
;
remoteIP
=
CU_IP
;
AssertFatal
(
createUDPsock
(
NULL
,
DU_PORT
,
remoteIP
,
CU_PORT
,
&
sockFS6
),
""
);
AssertFatal
(
createUDPsock
(
NULL
,
DU_PORT
,
remoteIP
,
CU_PORT
,
&
sockFS6
),
""
);
tpool_t
pool
;
tpool_t
*
Tpool
=
&
pool
;
char
params
[]
=
"-1,-1"
;
initTpool
(
params
,
Tpool
,
false
);
if
(
ru
->
start_rf
)
{
if
(
ru
->
start_rf
)
{
if
(
ru
->
start_rf
(
ru
)
!=
0
)
if
(
ru
->
start_rf
(
ru
)
!=
0
)
LOG_E
(
HW
,
"Could not start the RF device
\n
"
);
LOG_E
(
HW
,
"Could not start the RF device
\n
"
);
else
LOG_I
(
PHY
,
"RU %d rf device ready
\n
"
,
ru
->
idx
);
else
}
else
LOG_I
(
PHY
,
"RU %d no rf device
\n
"
,
ru
->
idx
);
LOG_I
(
PHY
,
"RU %d rf device ready
\n
"
,
ru
->
idx
);
}
else
LOG_I
(
PHY
,
"RU %d no rf device
\n
"
,
ru
->
idx
);
initStaticTime
(
begingWait
);
initStaticTime
(
begingWait
);
initRefTimes
(
waitRxAndProcessingUL
);
initRefTimes
(
waitRxAndProcessingUL
);
initRefTimes
(
fullLoop
);
initRefTimes
(
fullLoop
);
L1_rxtx_proc_t
L1proc
;
pthread_t
t
;
notifiedFIFO_t
nf
;
threadCreate
(
&
t
,
DL_du_fs6
,
(
void
*
)
ru
,
"MainDuTx"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
initNotifiedFIFO
(
&
nf
);
while
(
1
)
{
while
(
1
)
{
L1_rxtx_proc_t
*
proc
=
&
L1proc
;
L1_rxtx_proc_t
L1proc
;
updateTimesReset
(
begingWait
,
&
fullLoop
,
1000
,
true
,
"DU for full SubFrame (must be less 1ms)"
);
updateTimesReset
(
begingWait
,
&
fullLoop
,
1000
,
true
,
"DU for full SubFrame (must be less 1ms)"
);
pickStaticTime
(
begingWait
);
pickStaticTime
(
begingWait
);
notifiedFIFO_elt_t
*
Msg
=
newNotifiedFIFO_elt
(
sizeof
(
ru
),
0
,
&
nf
,
DL_du_fs6
);
UL_du_fs6
(
ru
,
&
L1proc
);
*
(
RU_t
**
)
NotifiedFifoData
(
Msg
)
=
ru
;
pushTpool
(
Tpool
,
Msg
);
UL_du_fs6
(
ru
,
proc
,
proc
->
frame_rx
,
proc
->
subframe_rx
);
notifiedFIFO_elt_t
*
res
=
pullTpool
(
&
nf
,
Tpool
);
updateTimesReset
(
begingWait
,
&
waitRxAndProcessingUL
,
1000
,
true
,
"DU Time in wait Rx + Ul processing"
);
updateTimesReset
(
begingWait
,
&
waitRxAndProcessingUL
,
1000
,
true
,
"DU Time in wait Rx + Ul processing"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
executables/main-ocp.c
View file @
63c02302
...
@@ -11,10 +11,11 @@
...
@@ -11,10 +11,11 @@
* The merger of OpenAir central code to this branch
* The merger of OpenAir central code to this branch
* should check if these 3 files are modified and analyze if code code has to be copied in here
* should check if these 3 files are modified and analyze if code code has to be copied in here
*/
*/
#define _GNU_SOURCE
#include <pthread.h>
#include <common/utils/LOG/log.h>
#include <common/utils/LOG/log.h>
#include <common/utils/system.h>
#include <common/utils/system.h>
static
int
DEFBANDS
[]
=
{
7
};
static
int
DEFBANDS
[]
=
{
7
};
static
int
DEFENBS
[]
=
{
0
};
static
int
DEFENBS
[]
=
{
0
};
#include <common/config/config_userapi.h>
#include <common/config/config_userapi.h>
...
@@ -44,7 +45,6 @@ void reset_opp_meas(void) {
...
@@ -44,7 +45,6 @@ void reset_opp_meas(void) {
// Fixme: there are many mistakes in the datamodel and in redondant variables
// Fixme: there are many mistakes in the datamodel and in redondant variables
// TDD is also mode complex
// TDD is also mode complex
void
setAllfromTS
(
uint64_t
TS
,
L1_rxtx_proc_t
*
proc
)
{
void
setAllfromTS
(
uint64_t
TS
,
L1_rxtx_proc_t
*
proc
)
{
for
(
int
i
=
0
;
i
<
RC
.
nb_inst
;
i
++
)
{
for
(
int
i
=
0
;
i
<
RC
.
nb_inst
;
i
++
)
{
for
(
int
j
=
0
;
j
<
RC
.
nb_CC
[
i
];
j
++
)
{
for
(
int
j
=
0
;
j
<
RC
.
nb_CC
[
i
];
j
++
)
{
LTE_DL_FRAME_PARMS
*
fp
=&
RC
.
eNB
[
i
][
j
]
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
fp
=&
RC
.
eNB
[
i
][
j
]
->
frame_parms
;
...
@@ -96,7 +96,6 @@ void init_eNB_proc(int inst) {
...
@@ -96,7 +96,6 @@ void init_eNB_proc(int inst) {
}
}
void
init_RU_proc
(
RU_t
*
ru
)
{
void
init_RU_proc
(
RU_t
*
ru
)
{
pthread_t
t
;
pthread_t
t
;
char
*
fs6
=
getenv
(
"fs6"
);
char
*
fs6
=
getenv
(
"fs6"
);
...
@@ -104,7 +103,7 @@ void init_RU_proc(RU_t *ru) {
...
@@ -104,7 +103,7 @@ void init_RU_proc(RU_t *ru) {
if
(
strncasecmp
(
fs6
,
"cu"
,
2
)
==
0
)
if
(
strncasecmp
(
fs6
,
"cu"
,
2
)
==
0
)
threadCreate
(
&
t
,
cu_fs6
,
(
void
*
)
ru
,
"MainCu"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
threadCreate
(
&
t
,
cu_fs6
,
(
void
*
)
ru
,
"MainCu"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
else
if
(
strncasecmp
(
fs6
,
"du"
,
2
)
==
0
)
{
else
if
(
strncasecmp
(
fs6
,
"du"
,
2
)
==
0
)
{
threadCreate
(
&
t
,
du_fs6
,
(
void
*
)
ru
,
"MainDu"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
threadCreate
(
&
t
,
du_fs6
,
(
void
*
)
ru
,
"MainDu
Rx
"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
}
else
}
else
AssertFatal
(
false
,
"environement variable fs6 is not cu or du"
);
AssertFatal
(
false
,
"environement variable fs6 is not cu or du"
);
}
else
}
else
...
@@ -415,7 +414,7 @@ void init_precoding_weights(PHY_VARS_eNB *eNB) {
...
@@ -415,7 +414,7 @@ void init_precoding_weights(PHY_VARS_eNB *eNB) {
}
}
}
}
void
prach_procedures_ocp
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
int
br_flag
)
{
void
prach_procedures_ocp
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
int
br_flag
)
{
uint16_t
max_preamble
[
4
],
max_preamble_energy
[
4
],
max_preamble_delay
[
4
],
avg_preamble_energy
[
4
];
uint16_t
max_preamble
[
4
],
max_preamble_energy
[
4
],
max_preamble_delay
[
4
],
avg_preamble_energy
[
4
];
RU_t
*
ru
;
RU_t
*
ru
;
int
aa
=
0
;
int
aa
=
0
;
...
@@ -536,7 +535,7 @@ void prach_procedures_ocp(PHY_VARS_eNB *eNB, L1_rxtx_proc_t * proc, int br_flag)
...
@@ -536,7 +535,7 @@ void prach_procedures_ocp(PHY_VARS_eNB *eNB, L1_rxtx_proc_t * proc, int br_flag)
}
}
}
// else br_flag
}
// else br_flag
void
prach_eNB
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
int
frame
,
int
subframe
)
{
void
prach_eNB
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
int
frame
,
int
subframe
)
{
// check if we have to detect PRACH first
// check if we have to detect PRACH first
if
(
is_prach_subframe
(
&
eNB
->
frame_parms
,
frame
,
subframe
)
>
0
)
{
if
(
is_prach_subframe
(
&
eNB
->
frame_parms
,
frame
,
subframe
)
>
0
)
{
prach_procedures_ocp
(
eNB
,
proc
,
0
);
prach_procedures_ocp
(
eNB
,
proc
,
0
);
...
@@ -576,7 +575,6 @@ static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name
...
@@ -576,7 +575,6 @@ static inline int rxtx(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc, char *thread_name
}
}
void
eNB_top
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
int
dummy1
,
int
dummy2
,
char
*
string
,
RU_t
*
ru
)
{
void
eNB_top
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
,
int
dummy1
,
int
dummy2
,
char
*
string
,
RU_t
*
ru
)
{
if
(
!
oai_exit
)
{
if
(
!
oai_exit
)
{
if
(
rxtx
(
eNB
,
proc
,
string
)
<
0
)
if
(
rxtx
(
eNB
,
proc
,
string
)
<
0
)
LOG_E
(
PHY
,
"eNB %d CC_id %d failed during execution
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
);
LOG_E
(
PHY
,
"eNB %d CC_id %d failed during execution
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
);
...
@@ -619,11 +617,13 @@ void rx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
...
@@ -619,11 +617,13 @@ void rx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
//ru->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
//ru->ts_offset += (proc->timestamp_rx - old_ts - fp->samples_per_tti);
//proc->timestamp_rx = ts-ru->ts_offset;
//proc->timestamp_rx = ts-ru->ts_offset;
}
}
old_ts
=
timestamp_rx
;
old_ts
=
timestamp_rx
;
setAllfromTS
(
timestamp_rx
,
proc
);
setAllfromTS
(
timestamp_rx
,
proc
);
}
}
void
tx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
)
{
int
tx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
)
{
int
ret
=
0
;
LTE_DL_FRAME_PARMS
*
fp
=
&
ru
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
fp
=
&
ru
->
frame_parms
;
void
*
txp
[
ru
->
nb_tx
];
void
*
txp
[
ru
->
nb_tx
];
int
i
;
int
i
;
...
@@ -671,7 +671,7 @@ void tx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
...
@@ -671,7 +671,7 @@ void tx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
/* add fail safe for late command end */
/* add fail safe for late command end */
// prepare tx buffer pointers
// prepare tx buffer pointers
ru
->
rfdevice
.
trx_write_func
(
&
ru
->
rfdevice
,
r
et
=
r
u
->
rfdevice
.
trx_write_func
(
&
ru
->
rfdevice
,
proc
->
timestamp_tx
+
ru
->
ts_offset
-
ru
->
openair0_cfg
.
tx_sample_advance
-
sf_extension
,
proc
->
timestamp_tx
+
ru
->
ts_offset
-
ru
->
openair0_cfg
.
tx_sample_advance
-
sf_extension
,
txp
,
txp
,
siglen
+
sf_extension
,
siglen
+
sf_extension
,
...
@@ -680,6 +680,8 @@ void tx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
...
@@ -680,6 +680,8 @@ void tx_rf(RU_t *ru, L1_rxtx_proc_t *proc) {
LOG_D
(
PHY
,
"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, subframe %d
\n
"
,
ru
->
idx
,
LOG_D
(
PHY
,
"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, subframe %d
\n
"
,
ru
->
idx
,
(
long
long
unsigned
int
)
proc
->
timestamp_tx
,
proc
->
frame_tx
,
proc
->
subframe_tx
);
(
long
long
unsigned
int
)
proc
->
timestamp_tx
,
proc
->
frame_tx
,
proc
->
subframe_tx
);
}
}
return
ret
;
}
}
static
void
*
ru_thread
(
void
*
param
)
{
static
void
*
ru_thread
(
void
*
param
)
{
...
@@ -687,13 +689,13 @@ static void *ru_thread( void *param ) {
...
@@ -687,13 +689,13 @@ static void *ru_thread( void *param ) {
setbuf
(
stderr
,
NULL
);
setbuf
(
stderr
,
NULL
);
RU_t
*
ru
=
(
RU_t
*
)
param
;
RU_t
*
ru
=
(
RU_t
*
)
param
;
L1_rxtx_proc_t
L1proc
;
L1_rxtx_proc_t
L1proc
;
L1_rxtx_proc_t
*
proc
=&
L1proc
;
L1_rxtx_proc_t
*
proc
=&
L1proc
;
if
(
ru
->
if_south
==
LOCAL_RF
)
{
// configure RF parameters only
if
(
ru
->
if_south
==
LOCAL_RF
)
{
// configure RF parameters only
fill_rf_config
(
ru
,
ru
->
rf_config_file
);
fill_rf_config
(
ru
,
ru
->
rf_config_file
);
init_frame_parms
(
&
ru
->
frame_parms
,
1
);
init_frame_parms
(
&
ru
->
frame_parms
,
1
);
phy_init_RU
(
ru
);
phy_init_RU
(
ru
);
openair0_device_load
(
&
ru
->
rfdevice
,
&
ru
->
openair0_cfg
);
init_rf
(
ru
);
}
}
AssertFatal
(
setup_RU_buffers
(
ru
)
==
0
,
"Exiting, cannot initialize RU Buffers
\n
"
);
AssertFatal
(
setup_RU_buffers
(
ru
)
==
0
,
"Exiting, cannot initialize RU Buffers
\n
"
);
...
@@ -750,8 +752,18 @@ static void *ru_thread( void *param ) {
...
@@ -750,8 +752,18 @@ static void *ru_thread( void *param ) {
return
NULL
;
return
NULL
;
}
}
int
init_rf
(
RU_t
*
ru
)
{
char
name
[
256
];
pthread_getname_np
(
pthread_self
(),
name
,
255
);
pthread_setname_np
(
pthread_self
(),
"UHD for OAI"
);
int
ret
=
openair0_device_load
(
&
ru
->
rfdevice
,
&
ru
->
openair0_cfg
);
pthread_setname_np
(
pthread_self
(),
name
);
return
ret
;
}
int
start_rf
(
RU_t
*
ru
)
{
int
start_rf
(
RU_t
*
ru
)
{
return
(
ru
->
rfdevice
.
trx_start_func
(
&
ru
->
rfdevice
));
int
ret
=
ru
->
rfdevice
.
trx_start_func
(
&
ru
->
rfdevice
);
return
ret
;
}
}
int
stop_rf
(
RU_t
*
ru
)
{
int
stop_rf
(
RU_t
*
ru
)
{
...
...
This diff is collapsed.
Click to expand it.
executables/split_headers.h
View file @
63c02302
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
#define DU_PORT "8787"
#define DU_PORT "8787"
#define MTU 65536
#define MTU 65536
#define UDP_TIMEOUT 1000L // in micro second (struct timeval, NOT struct timespec)
#define UDP_TIMEOUT 900000L // in micro second (struct timeval, NOT struct timespec)
// linux may timeout for a much longer time (up to 10ms)
#define MAX_BLOCKS 16
#define MAX_BLOCKS 16
#define blockAlign 32 //bytes
#define blockAlign 32 //bytes
...
@@ -236,8 +237,9 @@ void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_
...
@@ -236,8 +237,9 @@ void sendFs6Ul(PHY_VARS_eNB *eNB, int UE_id, int harq_pid, int segmentID, int16_
void
*
cu_fs6
(
void
*
arg
);
void
*
cu_fs6
(
void
*
arg
);
void
*
du_fs6
(
void
*
arg
);
void
*
du_fs6
(
void
*
arg
);
void
fill_rf_config
(
RU_t
*
ru
,
char
*
rf_config_file
);
void
fill_rf_config
(
RU_t
*
ru
,
char
*
rf_config_file
);
int
init_rf
(
RU_t
*
ru
);
void
rx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
void
rx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
void
tx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
int
tx_rf
(
RU_t
*
ru
,
L1_rxtx_proc_t
*
proc
);
void
common_signal_procedures
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
);
void
common_signal_procedures
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
);
void
pmch_procedures
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
);
void
pmch_procedures
(
PHY_VARS_eNB
*
eNB
,
L1_rxtx_proc_t
*
proc
);
bool
dlsch_procedures
(
PHY_VARS_eNB
*
eNB
,
bool
dlsch_procedures
(
PHY_VARS_eNB
*
eNB
,
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB.c
View file @
63c02302
...
@@ -9124,9 +9124,10 @@ rrc_enb_task(
...
@@ -9124,9 +9124,10 @@ rrc_enb_task(
itti_mark_task_ready
(
TASK_RRC_ENB
);
itti_mark_task_ready
(
TASK_RRC_ENB
);
LOG_I
(
RRC
,
"Entering main loop of RRC message task
\n
"
);
LOG_I
(
RRC
,
"Entering main loop of RRC message task
\n
"
);
while
(
1
)
{
//while (1) {
(
void
)
rrc_enb_process_itti_msg
(
NULL
);
//(void) rrc_enb_process_itti_msg(NULL);
}
//}
return
NULL
;
}
}
/*------------------------------------------------------------------------------*/
/*------------------------------------------------------------------------------*/
...
...
This diff is collapsed.
Click to expand it.
targets/COMMON/create_tasks.c
View file @
63c02302
...
@@ -61,7 +61,7 @@ int create_tasks(uint32_t enb_nb) {
...
@@ -61,7 +61,7 @@ int create_tasks(uint32_t enb_nb) {
rc
=
itti_create_task
(
TASK_RRC_ENB
,
rrc_enb_task
,
NULL
);
rc
=
itti_create_task
(
TASK_RRC_ENB
,
rrc_enb_task
,
NULL
);
AssertFatal
(
rc
>=
0
,
"Create task for RRC eNB failed
\n
"
);
AssertFatal
(
rc
>=
0
,
"Create task for RRC eNB failed
\n
"
);
if
(
EPC_MODE_ENABLED
)
{
if
(
EPC_MODE_ENABLED
&&
!
fs6Du
)
{
rc
=
itti_create_task
(
TASK_SCTP
,
sctp_eNB_task
,
NULL
);
rc
=
itti_create_task
(
TASK_SCTP
,
sctp_eNB_task
,
NULL
);
AssertFatal
(
rc
>=
0
,
"Create task for SCTP failed
\n
"
);
AssertFatal
(
rc
>=
0
,
"Create task for SCTP failed
\n
"
);
}
}
...
...
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