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
promise
OpenXG-RAN
Commits
b04f3b54
Commit
b04f3b54
authored
7 years ago
by
oai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
introduce distinct executables for ue and eNodeB (lte-uesoftmodem, lte-softmodem)
parent
45302792
develop
1
128-ues
256_QAM_demod
2cw_fairRRscd
340-fix-beamforming-for-multiple-antenna
375-syrtem-sdr-platform
383-ulsch-scheduler-optimization
401-bug-related-to-nr-pucch-format-2-generator
408-reworked
408-ue-main-threads
445-LDPC-implementation-on-GPU
459-pusch-based-ta-updates
464-ru_beamforming_in_gpu
464-ru_beamforming_in_gpu-CPUsubfunction
472-add-pusch-dmrs-modes
481-ldpc-decoder-on-gpu
5g_fapi_scf
LTE-sidelink
LTE_TRX_on_single_port
NCTU_CS_ISIP
NCTU_CS_ISIP_CPU
NCTU_CS_ISIP_GPU
NCTU_OpinConnect_LDPC
NR-PHY-MAC-IF-multi-UE
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_FDD_FIX
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_cleanup
NR_RA_updates
NR_RRCConfiguragion_FR2
NR_RRCConfiguration
NR_RRCConfiguration_FR2
NR_RRCConfiguration_S1U
NR_RRCConfiguration_merge_develop
NR_RRCConfiguration_sync_source
NR_RRCConfiguration_trx_thread
NR_RRC_CP_bugfix
NR_RRC_PDCP
NR_RRC_PRACH_procedures
NR_RRC_PRACH_procedures_todevelop
NR_RRC_PUSCH
NR_RRC_TA
NR_RRC_X2AP_AMBR_Change_Global_edge
NR_RRC_X2AP_RemoveHardcodings_GlobalEdge
NR_RRC_config_simplified
NR_RRC_harq
NR_RRC_harq_b
NR_RRC_harq_hacks
NR_RRC_harq_newdcipdu
NR_SA_F1AP_RFSIMULATOR
NR_SA_F1AP_RFSIMULATOR2
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_SCHED
NR_SCHED_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ_rebased
NR_SCHED_fixes
NR_SRB_Config
NR_TRX_on_single_port
NR_TRX_on_single_port2
NR_UE_MAC_scheduler
NR_UE_RA_fixes
NR_UE_UL_DCI_improvements
NR_UE_dlsch_bugfix
NR_UE_enable_parallelization
NR_UE_stability_fixes
NR_UL_FAPI_programming
NR_UL_scheduler
NR_UL_scheduler_rebased
NR_UL_scheduling
NR_Wireshark
NR_beam_simulation
NR_beamforming_test
NR_gNB_SCF_Indication
NR_ipaccess_testing
NR_mac_uci_functions_rework
NR_msg2_phytest
NR_scheduling_CSIRS
NR_scheduling_request
NR_scheduling_request2
NR_scheduling_request3
NR_test_S1U_RRC_PRACH_procedures
NR_ue_dlsch_dmrs_cdm
New-Merge-sidelink-develop
OpInConnect_ISIP
PUSCH_TA_update
RA_CI_test
UE_DL_DCI_hotfix
UpdateRANRemoteUEReport
add_iris_hw
addoptions_nr_USRPdevice
bch-fixes-bitmap
benetel_5g_prach_fix
benetel_driver_uldl_pf_merge
benetel_driver_update
benetel_phase_rotation
benetel_phase_rotation_old
block_mmse_receiver_with_whitenning
bugfix-find-uci
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-x2-SgNBAdditionRequest
bupt-sa-merge
cce_indexing_fix
cce_indexing_fix2
ci-deploy-asterix
ci-deploy-docker-compose
ci-rd-july-improvements
ci-test
ci-ul-iperf-from-trf-container
ci-yacine
clean-5G-scope-round2
cleanup_softmodem_main
constant_power
container_fix
container_v1.2.2
debug_branch_init_sync
develop-FeMBMS
develop-SA-RA
develop-SnT
develop-aarch64build
develop-ci
develop-ci-fju
develop-large-scale-emulations
develop-m2ap
develop-multi-RRUs
develop-nb-iot-merge
develop-nb-iot-merge-w-conflicts
develop-nb-iot-ntust
develop-nr
develop-nr-adding-2018-09-asn1
develop-nr-fr2
develop-nr-fr2-rework
develop-nr_cppcheck
develop-oriecpriupdates
develop-sib1
develop-sib1-local
develop-sib1-lts
develop-sib1-update
develop-sib1-update-test1
develop-sib1-update-ue
develop-vco3
develop_ci
develop_inria_ci_deployment
develop_inria_ci_deployment_gp
develop_inria_ci_deployment_gp_b4merge
develop_integration_2019_w44
develop_integration_2020_w15
develop_integration_2020_w19
develop_integration_w08
develop_jenkins_replay
develop_stable
dfts_alternatives
dlsch-all-dlslots
dlsch_encode_mthread
dlsch_parallel
dlsim-autotests
documentation
docupdate_tools
dongzhanyi-zte-0001
dongzhanyi-zte-develop
dongzhanyi-zte-develop2
dreibh/apt-auth-fix
dreibh/device-load-fix
dreibh/device-load-fix-develop-branch
dreibh/doxygen-fix
dual-connectivity
dummy
edrx
extend_sharedlibusage
extend_sharedlibusage2
fapi_for_dmrs_and_ptrs
feat-mac-sock
feature-247-tm89-fixes
feature-247-tm89-rebased
feature-368-channel-simulator
feature-4g-sched
feature-flexran-cm-s1ap
feature-nr-4g-nfapi-modifications
feature-pdcp-task
feature-send-rrc-message-for-wireshark-logging
feature-support-clang-format
feature/make-s1-mme-port-configurable
feature/make-s1-mme-port-configurable-with-astyle-fixes
feature_tm3
fembms-enb-ue
finalize-oaicn-integration
firas
fix-ci-tun
fix-clock-source
fix-dirty-ue-same-machine
fix-itti
fix-itti-segv
fix-l2-sim
fix-limeSDR-compile
fix-segfault-flexran-isolated
fix-softmodem-restart
fix-warnings
fix_NR_DLUL_PF
fix_do_ra_data
fix_pdsch_low_prb
fix_rfsim_mimo
fix_rrc_x2_ticking
fixes-CE-RLC-PDU-size
fixes-mac-sched-nfapi
fixes-mac-sched-tun
fixes-tun
flexran-apps
flexran-improvements
flexran-repair-mme-mgmt
flexran-report-split
fr2-hw-test
fujitsu_lte_contribution
fujitsu_lte_contribution-128
gNB-nrUE-USRP
generate_push_ptrs
gnb-only-test
harq-hotfix
hotfix-minor-remove-nr-rlc-cppcheck-error
hotfix-nr-rlc-tick
hotfix-ocp-executable
hotfix-ue-musim-compilation
hotfix_usrp_lib
improve_build_nr_lte_merge
improve_nr_modulation
improve_ue_stability
initial-nfapi-PNF-fixes
integration-develop-nr-2019w45
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
inter-RRU
inter-RRU-final
inter-RRU-nr
inter-RRU-oairu
inter-rru-UE
interoperability-test
isip_nr
issue392-simplify-s1-nos1step2_01
issue416_nfapicleanup
issue_345_l2_fapi_simulator
itti-enhancement
l2-fixes
ldpc-dec-layering
ldpc-decoder-codegen
ldpc-decoder-codegen2
ldpc-decoder-improvements
ldpc-offload
ldpc_short_codeword_fixes
load_gnb
lte-m-ue_type
lte-ulsch-bugfix
lte_uplink_improvement
mac-fixes-wk45_2
main_python
master
mbms-fix-develop-nr
merging-2019-w51-to-develop-nr
mex_mmse_receiver
minor-fix-doc-basic-sim
modify_fairRRscd_parallel
mosaic5g-oai-ran
mosaic5g-oai-sim
mu_allocate
multi-L1
multi-RRUs
nasmesh_kernel_5.8
new-gtpu
new_nos1
new_pdcp
new_rlc
new_rlc_2020
new_rlc_in_mbms
nfapi-L2-emulator
nfapi-bugfix
nfapi_improvement
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-1120-srb-gtp-yhz
ngap-wf-1203-yunsdr
ngap-wf-liuyu
ngap_lfq_1120
ngap_merge
noCore
nr-coreset-bug-fix
nr-dlsch-multi-thread
nr-dlsch-thread
nr-dual-connectivity
nr-interdigital-test
nr-ip-uplink-noS1
nr-mac-pdu-wireshark
nr-mac-remove-ue-list
nr-multiple-ssb
nr-pdcp
nr-pdsch-extraction-bugfix
nr-physim-update
nr-rlc-am-bugfix-w44
nr-rlc-bugfix-w44
nr-ssb-measurements
nr-timing-measurement
nr-timing-measurement-merge
nr-ue-buffer-status
nr-ue-slot-based
nr-uldci
nrUE
nrUE-hs
nrUE-upper-layer
nr_beamforming
nr_bsr
nr_ci_dlsim
nr_csi_newbranch
nr_dci_procedures
nr_demo_wsa2019
nr_dl_dmrs_type2
nr_dl_pf
nr_dl_pf2
nr_dl_ul_ptrs
nr_dlsch_parallel_measurements
nr_dlsim_plot
nr_fapi_for_push_tmp
nr_fdd_if_fix
nr_fix_easycppcheck
nr_flexible_NRBDL
nr_improve_build_procedures
nr_increase_tp
nr_mib_vsa_test
nr_pdcch_testing
nr_pdcch_updates
nr_pdsch_integration
nr_polar_decoder_improvement
nr_prach
nr_prach_fr2
nr_pucch
nr_pucch2
nr_segmentation_fixes
nr_sim_fix
nr_tdd_configuration
nr_ue_msg3
nr_ue_tti_cleanup
nr_ul_pf
nr_ul_scfdma
nr_vcd
nrue-multi-thread
nrue_msg2_reception
nsa-ue
nsa_remove_band_hardcodings
oai-sim
oai-ubuntu-docker
oai-ubuntu-docker-for-lmssdr
oairu
oairu-dockerfile-support
oc-docker-october-improvements
ocp_simulator
openxg/develop
pdcp-benchmark
pdsch-ch-est
polar8
preprocessor_refactor-2
ptrs_rrc_config
pusch-mthread-scaling-fix
pusch-retrans-fix-ue
ra-dl-ul
rau_rru_reciprocity_measurements
recode_itti_from_scratch
reduce_memory_footprint
release_v1_2_0_candidate
remove-ci-workaround
remove_nos1_hack_pdcp
remove_x2_gnb_hardcoding
repair-TA
revert-f5c94279
revert-itti
revert_memcpy
rh-ci-add-ue-parallelization
rh_ci_fix_autoterminate
rh_ci_fr1_update
rh_ci_oc
rh_ci_py
rh_ci_ra_fr2
rh_ci_rfsim_ra
rh_ci_ue_parallel
rh_doc_update_3
rh_fr1_newjenkins
rh_fr1_update
rh_gnb_compile_fix
rh_wk50_debug
rhel77-build
rlc-v2-bugfix-status-reporting
rlc-v2-tick
rlc_v2_coverity_fixes
rrc-enb-phy-testmode
ru-parallel-beamforming
ru_rau_enhancement
ru_rau_enhancement-external-timing
runel
runel-reverse-test
s1-subnormal_rewrite
s1_subnormal
s1_subnormal-robert
s1ap-bugfix-rab_setup
sa-demo
sa-merge-rrc-srb
sa-msg4
sa-msg4-rrc
sa-msg4-rrc-yihz
sa-msg4-rrc-yihz-hs
sa_rrc_yihz
signal-delay
small-bugfixes-w40
small-config-change
smallcleanup
softmodem_cleanup
split73
test-x310-perf
testing_2symb_pdcch
testing_with_external_txdata
thread-pool
tools_5Gadapt
tp-ota-test
trx_thread_param
trx_write_thread
ue-csi
ue-fixes
ue-fixes-ota
ue-updates-runel-test
ue_adjust_gain
ue_beam_selection
ue_dlsch-multi-threading
ue_dlsch_decoding_ldpc_offload
ue_nfapi_mch
uhd_priority_set_cleanup
ul-freq-iq-samps-to-file
ul_dl_dci_same_slot
ul_harq
ulsch_decode_mthread
ulsim_changes
update-to-2019-march-june-release
usrp_fix_adc_shift_and_pps_sync
usrp_gpio_test
wireshark-T-hack-ueid
wireshark-log-scheduling-requests
workaround-rebased
workaround-restart-not-working
x2-endc-processing
x2_neighbor_6cells
x2_tdd
xiangwab
xiangwan
yihongzheng_srb
zzs
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
2020.w16
2020.w15
2020.w11
2020.w09
2020.w06
2020.w05
2020.w04
2020.w03
2019.w51
2019.w44
2019.w41
2019.w36
2019.w30
2019.w28
2019.w27
2019.w25
2019.w23
2019.w21
2019.w17
2019.w15
2019.w13
2019.w11
2019.w10
2019.w09
2019.w08
2019.w07
2019.w06
2019.w04
2019.w03
2018.w51
2018.w48
2018.w47
2018.w46
2018.w44
2018.w41
2018.w40
2018.w39
2018.w36
2018.w33
2018.w31
2018.w29
2018.w25
2018.w19
2018.w15
2018.w12
2018.w11
2018.w10
v1.2.2
v1.2.1
v1.2.0
v1.1.1
v1.1.0
v1.0.3
v1.0.2
v1.0.1
v1.0.0
osa-etsi-ws-ue
osa-etsi-ws-try2
osa-etsi-ws-try1
osa-etsi-ws-gNB
oai_nr_sync
nr-ip-over-lte
nr-ip-over-lte-v.1.5
nr-ip-over-lte-v.1.4
nr-ip-over-lte-v.1.3
nr-ip-over-lte-v.1.2
nr-ip-over-lte-v.1.1
nr-ip-over-lte-v.1.0
develop-nr-pdcch
develop-nr-2020w03
develop-nr-2020w02
develop-nr-2019w51
develop-nr-2019w50
develop-nr-2019w48
develop-nr-2019w47
develop-nr-2019w45
develop-nr-2019w43
develop-nr-2019w42
develop-nr-2019w40
develop-nr-2019w28
develop-nr-2019w23
benetel_phase_rotation
No related merge requests found
Changes
21
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
1420 additions
and
549 deletions
+1420
-549
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+77
-13
cmake_targets/build_oai
cmake_targets/build_oai
+17
-3
common/utils/load_module_shlib.c
common/utils/load_module_shlib.c
+37
-15
common/utils/load_module_shlib.h
common/utils/load_module_shlib.h
+19
-9
common/utils/telnetsrv/telnetsrv.c
common/utils/telnetsrv/telnetsrv.c
+8
-2
common/utils/telnetsrv/telnetsrv.h
common/utils/telnetsrv/telnetsrv.h
+2
-0
openair1/PHY/CODING/3gpplte_sse.c
openair1/PHY/CODING/3gpplte_sse.c
+1
-1
openair1/PHY/CODING/3gpplte_turbo_decoder.c
openair1/PHY/CODING/3gpplte_turbo_decoder.c
+9
-1
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
+2
-0
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
+2
-0
openair1/PHY/CODING/coding_load.c
openair1/PHY/CODING/coding_load.c
+61
-12
openair1/PHY/CODING/defs.h
openair1/PHY/CODING/defs.h
+3
-105
openair1/PHY/INIT/init_top.c
openair1/PHY/INIT/init_top.c
+1
-1
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
+2
-4
openair1/PHY/extern.h
openair1/PHY/extern.h
+1
-1
openair1/PHY/vars.h
openair1/PHY/vars.h
+1
-1
openair2/RRC/LITE/L2_interface_ue.c
openair2/RRC/LITE/L2_interface_ue.c
+1
-0
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+1
-1
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+33
-376
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-softmodem.h
+3
-4
targets/RT/USER/lte-uesoftmodem.c
targets/RT/USER/lte-uesoftmodem.c
+1139
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
b04f3b54
...
@@ -1216,9 +1216,7 @@ set(PHY_SRC_UE
...
@@ -1216,9 +1216,7 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/CODING/ccoding_byte_lte.c
${
OPENAIR1_DIR
}
/PHY/CODING/ccoding_byte_lte.c
${
OPENAIR1_DIR
}
/PHY/CODING/3gpplte_sse.c
${
OPENAIR1_DIR
}
/PHY/CODING/3gpplte_sse.c
${
OPENAIR1_DIR
}
/PHY/CODING/crc_byte.c
${
OPENAIR1_DIR
}
/PHY/CODING/crc_byte.c
${
OPENAIR1_DIR
}
/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
${
PHY_TURBOIF
}
${
OPENAIR1_DIR
}
/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
${
OPENAIR1_DIR
}
/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
${
OPENAIR1_DIR
}
/PHY/CODING/lte_rate_matching.c
${
OPENAIR1_DIR
}
/PHY/CODING/lte_rate_matching.c
${
OPENAIR1_DIR
}
/PHY/CODING/viterbi.c
${
OPENAIR1_DIR
}
/PHY/CODING/viterbi.c
${
OPENAIR1_DIR
}
/PHY/CODING/viterbi_lte.c
${
OPENAIR1_DIR
}
/PHY/CODING/viterbi_lte.c
...
@@ -1946,14 +1944,12 @@ add_executable(lte-softmodem
...
@@ -1946,14 +1944,12 @@ add_executable(lte-softmodem
${
s1ap_h
}
${
s1ap_h
}
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks_ue.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR3_DIR
}
/NAS/UE/nas_ue_task.c
${
OPENAIR3_DIR
}
/NAS/UE/nas_ue_task.c
...
@@ -1969,9 +1965,9 @@ add_executable(lte-softmodem
...
@@ -1969,9 +1965,9 @@ add_executable(lte-softmodem
target_link_libraries
(
lte-softmodem
target_link_libraries
(
lte-softmodem
-Wl,--start-group
-Wl,--start-group
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
${
ITTI_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2
NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
${
ITTI_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
NFAPI_USER_LIB
NFAPI_
COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_
USER_LIB
-Wl,--end-group z dl
)
-Wl,--end-group z dl
)
target_link_libraries
(
lte-softmodem
${
LIBXML2_LIBRARIES
}
)
target_link_libraries
(
lte-softmodem
${
LIBXML2_LIBRARIES
}
)
...
@@ -1986,14 +1982,12 @@ add_executable(lte-softmodem-nos1
...
@@ -1986,14 +1982,12 @@ add_executable(lte-softmodem-nos1
${
s1ap_h
}
${
s1ap_h
}
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-enb.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-softmodem.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks_ue.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/rb_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/rb_config.c
...
@@ -2007,9 +2001,9 @@ add_executable(lte-softmodem-nos1
...
@@ -2007,9 +2001,9 @@ add_executable(lte-softmodem-nos1
)
)
target_link_libraries
(
lte-softmodem-nos1
target_link_libraries
(
lte-softmodem-nos1
-Wl,--start-group
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2
${
MSC_LIB
}
${
RAL_LIB
}
${
ITTI_LIB
}
NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB
${
MIH_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
NFAPI_USER_LIB
NFAPI_
COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_
USER_LIB
-Wl,--end-group z dl
)
-Wl,--end-group z dl
)
target_link_libraries
(
lte-softmodem-nos1
${
LIBXML2_LIBRARIES
}
)
target_link_libraries
(
lte-softmodem-nos1
${
LIBXML2_LIBRARIES
}
)
...
@@ -2017,6 +2011,76 @@ target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt
...
@@ -2017,6 +2011,76 @@ target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt
target_link_libraries
(
lte-softmodem-nos1
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
lte-softmodem-nos1
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
lte-softmodem-nos1
${
T_LIB
}
)
target_link_libraries
(
lte-softmodem-nos1
${
T_LIB
}
)
# lte-uesoftmodem is UE implementation
#######################################
add_executable
(
lte-uesoftmodem
${
rrc_h
}
${
s1ap_h
}
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-uesoftmodem.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks_ue.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR3_DIR
}
/NAS/UE/nas_ue_task.c
${
OPENAIR_DIR
}
/common/utils/utils.c
${
OPENAIR_DIR
}
/common/utils/system.c
${
XFORMS_SOURCE
}
${
XFORMS_SOURCE_SOFTMODEM
}
${
T_SOURCE
}
${
CONFIG_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
target_link_libraries
(
lte-uesoftmodem
-Wl,--start-group
RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_UE_LIB PHY_UE LFDS L2_UE
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
${
ITTI_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
LFDS7
-Wl,--end-group z dl
)
target_link_libraries
(
lte-uesoftmodem
${
LIBXML2_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem pthread m
${
CONFIG_LIBRARIES
}
rt crypt
${
CRYPTO_LIBRARIES
}
${
OPENSSL_LIBRARIES
}
${
NETTLE_LIBRARIES
}
sctp
${
XFORMS_LIBRARIES
}
${
PROTOBUF_LIB
}
${
CMAKE_DL_LIBS
}
${
LIBYAML_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem
${
T_LIB
}
)
# lte-softmodem-nos1 is both eNB and UE implementation
###################################################
add_executable
(
lte-uesoftmodem-nos1
${
rrc_h
}
${
s1ap_h
}
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ue.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-uesoftmodem.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/SIMU/USER/init_lte.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks_ue.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR2_DIR
}
/RRC/NAS/nas_config.c
${
OPENAIR2_DIR
}
/RRC/NAS/rb_config.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
${
OPENAIR_DIR
}
/common/utils/system.c
${
XFORMS_SOURCE
}
${
XFORMS_SOURCE_SOFTMODEM
}
${
T_SOURCE
}
${
CONFIG_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
target_link_libraries
(
lte-uesoftmodem-nos1
-Wl,--start-group
RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_UE_LIB PHY_UE LFDS L2_UE
${
MSC_LIB
}
${
RAL_LIB
}
${
ITTI_LIB
}
${
MIH_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
LFDS7
-Wl,--end-group z dl
)
target_link_libraries
(
lte-uesoftmodem-nos1
${
LIBXML2_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem-nos1 pthread m
${
CONFIG_LIBRARIES
}
rt crypt
${
CRYPTO_LIBRARIES
}
${
OPENSSL_LIBRARIES
}
${
NETTLE_LIBRARIES
}
sctp
${
XFORMS_LIBRARIES
}
${
PROTOBUF_LIB
}
${
CMAKE_DL_LIBS
}
${
LIBYAML_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem-nos1
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem-nos1
${
T_LIB
}
)
# USIM process
# USIM process
#################
#################
#add_executable(usim
#add_executable(usim
...
...
This diff is collapsed.
Click to expand it.
cmake_targets/build_oai
View file @
b04f3b54
...
@@ -359,7 +359,11 @@ function main() {
...
@@ -359,7 +359,11 @@ function main() {
CMAKE_CMD
=
"
$CMAKE_CMD
.."
CMAKE_CMD
=
"
$CMAKE_CMD
.."
echo_info
"CMAKE_CMD=
$CMAKE_CMD
"
echo_info
"CMAKE_CMD=
$CMAKE_CMD
"
if
[
"
$eNB
"
=
"1"
]
&&
[
"
$UE
"
=
"1"
]
;
then
echo_error
"Cannot build UE and eNB on one build_oai execution"
echo_error
"use 2 build_oai invocations"
exit
fi
#########################################################
#########################################################
# check validity of HW and TP parameters for eNB
# check validity of HW and TP parameters for eNB
#########################################################
#########################################################
...
@@ -488,10 +492,20 @@ function main() {
...
@@ -488,10 +492,20 @@ function main() {
DIR
=
$OPENAIR_DIR
/cmake_targets
DIR
=
$OPENAIR_DIR
/cmake_targets
if
[
"
$NOS1
"
=
"1"
]
;
then
if
[
"
$NOS1
"
=
"1"
]
;
then
lte_build_dir
=
lte_noS1_build_oai
lte_build_dir
=
lte_noS1_build_oai
lte_exec
=
lte-softmodem-nos1
if
[
"
$eNB
"
=
"1"
]
;
then
lte_exec
=
lte-softmodem-nos1
fi
if
[
"
$UE
"
=
"1"
]
;
then
lte_exec
=
lte-uesoftmodem-nos1
fi
else
else
lte_build_dir
=
lte_build_oai
lte_build_dir
=
lte_build_oai
lte_exec
=
lte-softmodem
if
[
"
$eNB
"
=
"1"
]
;
then
lte_exec
=
lte-softmodem
fi
if
[
"
$UE
"
=
"1"
]
;
then
lte_exec
=
lte-uesoftmodem
fi
fi
fi
# configuration module libraries, one currently available, using libconfig
# configuration module libraries, one currently available, using libconfig
...
...
This diff is collapsed.
Click to expand it.
common/utils/load_module_shlib.c
View file @
b04f3b54
...
@@ -48,11 +48,11 @@ void loader_init(void) {
...
@@ -48,11 +48,11 @@ void loader_init(void) {
loader_data
.
mainexec_buildversion
=
PACKAGE_VERSION
;
loader_data
.
mainexec_buildversion
=
PACKAGE_VERSION
;
int
ret
=
config_get
(
LoaderParams
,
sizeof
(
LoaderParams
)
/
sizeof
(
paramdef_t
),
LOADER_CONFIG_PREFIX
);
int
ret
=
config_get
(
LoaderParams
,
sizeof
(
LoaderParams
)
/
sizeof
(
paramdef_t
),
LOADER_CONFIG_PREFIX
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
fprintf
(
stderr
,
"[LOADER] %s %d configuration couldn't be performed"
,
__FILE__
,
__LINE__
);
printf
(
"[LOADER] configuration couldn't be performed via config module, parameters set to default values
\n
"
);
if
(
loader_data
.
shlibpath
==
NULL
)
{
if
(
loader_data
.
shlibpath
==
NULL
)
{
loader_data
.
shlibpath
=
DEFAULT_PATH
;
loader_data
.
shlibpath
=
DEFAULT_PATH
;
}
}
return
;
loader_data
.
maxshlibs
=
DEFAULT_MAXSHLIBS
;
}
}
loader_data
.
shlibs
=
malloc
(
loader_data
.
maxshlibs
*
sizeof
(
loader_shlibdesc_t
));
loader_data
.
shlibs
=
malloc
(
loader_data
.
maxshlibs
*
sizeof
(
loader_shlibdesc_t
));
if
(
loader_data
.
shlibs
==
NULL
)
{
if
(
loader_data
.
shlibs
==
NULL
)
{
...
@@ -96,7 +96,10 @@ int ret;
...
@@ -96,7 +96,10 @@ int ret;
if
(
shlibpath
==
NULL
)
{
if
(
shlibpath
==
NULL
)
{
shlibpath
=
loader_data
.
shlibpath
;
shlibpath
=
loader_data
.
shlibpath
;
}
}
/* no specific shared lib version */
if
(
shlibversion
==
NULL
)
{
shlibversion
=
""
;
}
/* alloc memory for full module shared lib file name */
/* alloc memory for full module shared lib file name */
tmpstr
=
malloc
(
strlen
(
shlibpath
)
+
strlen
(
modname
)
+
strlen
(
shlibversion
)
+
16
);
tmpstr
=
malloc
(
strlen
(
shlibpath
)
+
strlen
(
modname
)
+
strlen
(
shlibversion
)
+
16
);
if
(
tmpstr
==
NULL
)
{
if
(
tmpstr
==
NULL
)
{
...
@@ -120,6 +123,7 @@ int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
...
@@ -120,6 +123,7 @@ int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
void
*
lib_handle
;
void
*
lib_handle
;
initfunc_t
fpi
;
initfunc_t
fpi
;
checkverfunc_t
fpc
;
checkverfunc_t
fpc
;
getfarrayfunc_t
fpg
;
char
*
shlib_path
;
char
*
shlib_path
;
char
*
afname
=
NULL
;
char
*
afname
=
NULL
;
int
ret
=
0
;
int
ret
=
0
;
...
@@ -155,25 +159,29 @@ int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
...
@@ -155,25 +159,29 @@ int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
}
}
if
(
farray
!=
NULL
)
{
if
(
farray
!=
NULL
)
{
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
funcarray
=
malloc
(
numf
*
sizeof
(
loader_shlibfunc_t
));
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
numfunc
=
0
;
for
(
int
i
=
0
;
i
<
numf
;
i
++
)
{
for
(
int
i
=
0
;
i
<
numf
;
i
++
)
{
farray
[
i
].
fptr
=
dlsym
(
lib_handle
,
farray
[
i
].
fname
);
farray
[
i
].
fptr
=
dlsym
(
lib_handle
,
farray
[
i
].
fname
);
if
(
farray
[
i
].
fptr
==
NULL
)
{
if
(
farray
[
i
].
fptr
==
NULL
)
{
fprintf
(
stderr
,
"[LOADER] %s %d %s function not found %s
\n
"
,
__FILE__
,
__LINE__
,
dlerror
(),
farray
[
i
].
fname
);
fprintf
(
stderr
,
"[LOADER] %s %d %s function not found %s
\n
"
,
__FILE__
,
__LINE__
,
dlerror
(),
farray
[
i
].
fname
);
ret
=
-
1
;
ret
=
-
1
;
}
}
else
{
/* farray[i].fptr == NULL */
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
funcarray
[
i
].
fname
=
strdup
(
farray
[
i
].
fname
);
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
funcarray
[
i
].
fptr
=
farray
[
i
].
fptr
;
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
numfunc
++
;
}
/* farray[i].fptr != NULL */
}
/* for int i... */
}
/* for int i... */
}
/* farray ! NULL */
}
else
{
/* farray ! NULL */
sprintf
(
afname
,
"%s_getfarray"
,
modname
);
fpg
=
dlsym
(
lib_handle
,
afname
);
if
(
fpg
!=
NULL
)
{
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
numfunc
=
fpg
(
&
(
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
funcarray
));
}
}
/* farray ! NULL */
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
name
=
strdup
(
modname
);
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
name
=
strdup
(
modname
);
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
thisshlib_path
=
strdup
(
shlib_path
);
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
thisshlib_path
=
strdup
(
shlib_path
);
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
funcarray
=
malloc
(
numf
*
sizeof
(
loader_shlibfunc_t
));
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
numfunc
=
0
;
for
(
int
i
=
0
;
i
<
numf
;
i
++
)
{
if
(
farray
[
i
].
fptr
!=
NULL
)
{
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
funcarray
[
i
].
fname
=
strdup
(
farray
[
i
].
fname
);
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
funcarray
[
i
].
fptr
=
farray
[
i
].
fptr
;
loader_data
.
shlibs
[
loader_data
.
numshlibs
].
numfunc
++
;
}
}
(
loader_data
.
numshlibs
)
++
;
(
loader_data
.
numshlibs
)
++
;
}
/* lib_handle != NULL */
}
/* lib_handle != NULL */
...
@@ -182,3 +190,17 @@ int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
...
@@ -182,3 +190,17 @@ int load_module_shlib(char *modname,loader_shlibfunc_t *farray, int numf)
if
(
lib_handle
!=
NULL
)
dlclose
(
lib_handle
);
if
(
lib_handle
!=
NULL
)
dlclose
(
lib_handle
);
return
ret
;
return
ret
;
}
}
void
*
get_shlibmodule_fptr
(
char
*
modname
,
char
*
fname
)
{
for
(
int
i
=
0
;
i
<
loader_data
.
numshlibs
&&
loader_data
.
shlibs
[
i
].
name
!=
NULL
;
i
++
)
{
if
(
strcmp
(
loader_data
.
shlibs
[
i
].
name
,
modname
)
==
0
)
{
for
(
int
j
=
0
;
j
<
loader_data
.
shlibs
[
i
].
numfunc
;
j
++
)
{
if
(
strcmp
(
loader_data
.
shlibs
[
i
].
funcarray
[
j
].
fname
,
fname
)
==
0
)
{
return
loader_data
.
shlibs
[
i
].
funcarray
[
j
].
fptr
;
}
}
/* for j loop on module functions*/
}
}
/* for i loop on modules */
return
NULL
;
}
This diff is collapsed.
Click to expand it.
common/utils/load_module_shlib.h
View file @
b04f3b54
...
@@ -33,8 +33,7 @@
...
@@ -33,8 +33,7 @@
#define LOAD_SHLIB_H
#define LOAD_SHLIB_H
typedef
int
(
*
initfunc_t
)(
void
);
typedef
int
(
*
checkverfunc_t
)(
char
*
mainexec_version
,
char
**
shlib_version
);
typedef
struct
{
typedef
struct
{
char
*
fname
;
char
*
fname
;
...
@@ -58,23 +57,34 @@ typedef struct {
...
@@ -58,23 +57,34 @@ typedef struct {
loader_shlibdesc_t
*
shlibs
;
loader_shlibdesc_t
*
shlibs
;
}
loader_data_t
;
}
loader_data_t
;
/* function type of functions which may be implemented by a module */
/* 1: init function, called when loading, if found in the shared lib */
typedef
int
(
*
initfunc_t
)(
void
);
/* 2: version checking function, called when loading, if it returns -1, trigger main exec abort */
typedef
int
(
*
checkverfunc_t
)(
char
*
mainexec_version
,
char
**
shlib_version
);
/* 3: get function array function, called when loading when a module doesn't provide */
/* the function array when calling load_module_shlib (farray param NULL) */
typedef
int
(
*
getfarrayfunc_t
)(
loader_shlibfunc_t
**
funcarray
);
#ifdef LOAD_MODULE_SHLIB_MAIN
#ifdef LOAD_MODULE_SHLIB_MAIN
#define LOADER_CONFIG_PREFIX "loader"
#define LOADER_CONFIG_PREFIX "loader"
#define DEFAULT_PATH ""
#define DEFAULT_PATH ""
#define DEFAULT_MAXSHLIBS 10
loader_data_t
loader_data
;
loader_data_t
loader_data
;
/*----------------------------------------------------------------------------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------------------------------------------------------------------------
--
*/
/* LOADER parameters */
/* LOADER parameters
*/
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/* optname helpstr paramflags XXXptr defXXXval
type numelt */
/*----------------------------------------------------------------------------------------------------------------------------------------------*/
/*----------------------------------------------------------------------------------------------------------------------------------------------
--
*/
#define LOADER_PARAMS_DESC { \
#define LOADER_PARAMS_DESC { \
{"shlibpath", NULL, PARAMFLAG_NOFREE, strptr:(char **)&(loader_data.shlibpath), defstrval:DEFAULT_PATH, TYPE_STRING, 0}, \
{"shlibpath", NULL, PARAMFLAG_NOFREE, strptr:(char **)&(loader_data.shlibpath), defstrval:DEFAULT_PATH,
TYPE_STRING, 0}, \
{"maxshlibs", NULL, 0, uptr:&(loader_data.maxshlibs), defintval:
10,
TYPE_UINT32, 0}, \
{"maxshlibs", NULL, 0, uptr:&(loader_data.maxshlibs), defintval:
DEFAULT_MAXSHLIBS,
TYPE_UINT32, 0}, \
}
}
/*-------------------------------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------------------------------*/
#else
/* LOAD_MODULE_SHLIB_MAIN */
#else
/* LOAD_MODULE_SHLIB_MAIN */
extern
int
load_module_shlib
(
char
*
modname
,
loader_shlibfunc_t
*
farray
,
int
numf
);
extern
int
load_module_shlib
(
char
*
modname
,
loader_shlibfunc_t
*
farray
,
int
numf
);
extern
void
*
get_shlibmodule_fptr
(
char
*
modname
,
char
*
fname
);
extern
loader_data_t
loader_data
;
extern
loader_data_t
loader_data
;
#endif
/* LOAD_MODULE_SHLIB_MAIN */
#endif
/* LOAD_MODULE_SHLIB_MAIN */
...
...
This diff is collapsed.
Click to expand it.
common/utils/telnetsrv/telnetsrv.c
View file @
b04f3b54
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
#include <dlfcn.h>
#include <dlfcn.h>
#include <sys/time.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/resource.h>
#include "common/utils/load_module_shlib.h"
#include "common/config/config_userapi.h"
#include "common/config/config_userapi.h"
#include <readline/history.h>
#include <readline/history.h>
...
@@ -787,4 +787,10 @@ int telnetsrv_checkbuildver(char * mainexec_buildversion, char ** shlib_buildve
...
@@ -787,4 +787,10 @@ int telnetsrv_checkbuildver(char * mainexec_buildversion, char ** shlib_buildve
return
0
;
return
0
;
}
}
int
telnetsrv_getfarray
(
loader_shlibfunc_t
**
farray
)
{
*
farray
=
malloc
(
sizeof
(
loader_shlibfunc_t
));
(
*
farray
)[
0
].
fname
=
TELNET_ADDCMD_FNAME
;
(
*
farray
)[
0
].
fptr
=
(
int
(
*
)(
void
)
)
add_telnetcmd
;
return
1
;
}
This diff is collapsed.
Click to expand it.
common/utils/telnetsrv/telnetsrv.h
View file @
b04f3b54
...
@@ -131,6 +131,8 @@ VT escape sequence definition, for smarter display....
...
@@ -131,6 +131,8 @@ VT escape sequence definition, for smarter display....
#define STDFMT "\x1b[0m"
#define STDFMT "\x1b[0m"
/*---------------------------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------------------------*/
#define TELNET_ADDCMD_FNAME "add_telnetcmd"
typedef
int
(
*
add_telnetcmd_func_t
)(
char
*
,
telnetshell_vardef_t
*
,
telnetshell_cmddef_t
*
);
#ifdef TELNETSERVERCODE
#ifdef TELNETSERVERCODE
int
add_telnetcmd
(
char
*
modulename
,
telnetshell_vardef_t
*
var
,
telnetshell_cmddef_t
*
cmd
);
int
add_telnetcmd
(
char
*
modulename
,
telnetshell_vardef_t
*
var
,
telnetshell_cmddef_t
*
cmd
);
void
set_sched
(
pthread_t
tid
,
int
pid
,
int
priority
);
void
set_sched
(
pthread_t
tid
,
int
pid
,
int
priority
);
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/3gpplte_sse.c
View file @
b04f3b54
...
@@ -696,7 +696,7 @@ int main(int argc,char **argv)
...
@@ -696,7 +696,7 @@ int main(int argc,char **argv)
printf
(
"Input %d : %d
\n
"
,
i
,
input
[
i
]);
printf
(
"Input %d : %d
\n
"
,
i
,
input
[
i
]);
}
}
threegpplte_turbo_encoder
(
&
input
[
0
],
threegpplte_turbo_encoder
_sse
(
&
input
[
0
],
INPUT_LENGTH
,
INPUT_LENGTH
,
&
output
[
0
],
&
output
[
0
],
0
,
0
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/3gpplte_turbo_decoder.c
View file @
b04f3b54
...
@@ -874,14 +874,22 @@ void compute_ext_s(llr_t* alpha,llr_t* beta,llr_t* m_11,llr_t* m_10,llr_t* ext,
...
@@ -874,14 +874,22 @@ void compute_ext_s(llr_t* alpha,llr_t* beta,llr_t* m_11,llr_t* m_10,llr_t* ext,
unsigned
char
phy_threegpplte_turbo_decoder_scalar
(
llr_t
*
y
,
unsigned
char
phy_threegpplte_turbo_decoder_scalar
(
llr_t
*
y
,
llr_t
*
y2
,
unsigned
char
*
decoded_bytes
,
unsigned
char
*
decoded_bytes
,
unsigned
char
*
decoded_bytes2
,
unsigned
short
n
,
unsigned
short
n
,
unsigned
short
f1
,
unsigned
short
f1
,
unsigned
short
f2
,
unsigned
short
f2
,
unsigned
char
max_iterations
,
unsigned
char
max_iterations
,
unsigned
char
crc_type
,
unsigned
char
crc_type
,
unsigned
char
F
,
unsigned
char
F
,
unsigned
char
inst
)
time_stats_t
*
init_stats
,
time_stats_t
*
alpha_stats
,
time_stats_t
*
beta_stats
,
time_stats_t
*
gamma_stats
,
time_stats_t
*
ext_stats
,
time_stats_t
*
intl1_stats
,
time_stats_t
*
intl2_stats
)
{
{
/* y is a pointer to the input
/* y is a pointer to the input
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
View file @
b04f3b54
...
@@ -1172,7 +1172,9 @@ void init_td16(void)
...
@@ -1172,7 +1172,9 @@ void init_td16(void)
}
}
unsigned
char
phy_threegpplte_turbo_decoder16
(
short
*
y
,
unsigned
char
phy_threegpplte_turbo_decoder16
(
short
*
y
,
short
*
y2
,
unsigned
char
*
decoded_bytes
,
unsigned
char
*
decoded_bytes
,
unsigned
char
*
decoded_bytes2
,
unsigned
short
n
,
unsigned
short
n
,
unsigned
short
f1
,
unsigned
short
f1
,
unsigned
short
f2
,
unsigned
short
f2
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/3gpplte_turbo_decoder_sse_8bit.c
View file @
b04f3b54
...
@@ -898,7 +898,9 @@ void init_td8(void)
...
@@ -898,7 +898,9 @@ void init_td8(void)
}
}
unsigned
char
phy_threegpplte_turbo_decoder8
(
short
*
y
,
unsigned
char
phy_threegpplte_turbo_decoder8
(
short
*
y
,
short
y2
,
unsigned
char
*
decoded_bytes
,
unsigned
char
*
decoded_bytes
,
unsigned
char
*
decoded_bytes2
,
unsigned
short
n
,
unsigned
short
n
,
unsigned
short
f1
,
unsigned
short
f1
,
unsigned
short
f2
,
unsigned
short
f2
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/coding_load.c
View file @
b04f3b54
...
@@ -29,13 +29,32 @@
...
@@ -29,13 +29,32 @@
* \note
* \note
* \warning
* \warning
*/
*/
#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/types.h>
#include "PHY/defs.h"
#include "PHY/defs.h"
#include "PHY/extern.h"
#include "common/utils/load_module_shlib.h"
#include "common/utils/load_module_shlib.h"
#include "common/utils/telnetsrv/telnetsrv.h"
static
int
coding_setmod_cmd
(
char
*
buff
,
int
debug
,
telnet_printfunc_t
prnt
);
static
telnetshell_cmddef_t
coding_cmdarray
[]
=
{
{
"mode"
,
"[sse,avx2,stdc,none]"
,
coding_setmod_cmd
},
{
""
,
""
,
NULL
},
};
telnetshell_vardef_t
coding_vardef
[]
=
{
{
"maxiter"
,
TELNET_VARTYPE_INT32
,
&
max_turbo_iterations
},
{
""
,
0
,
NULL
}
};
/* PHY/defs.h contains MODE_DECODE_XXX macros, following table must match */
static
char
*
modedesc
[]
=
{
"none"
,
"sse"
,
"C"
,
"avx2"
};
static
int
curmode
;
/* function description array, to be used when loading the encoding/decoding shared lib */
loader_shlibfunc_t
shlib_fdesc
[
DECODE_NUM_FPTR
];
loader_shlibfunc_t
shlib_fdesc
[
DECODE_NUM_FPTR
];
/* encoding decoding functions pointers, filled here and used when encoding/decoding */
/*defined as extern in PHY?CODING/extern.h */
decoder_if_t
decoder16
;
decoder_if_t
decoder16
;
decoder_if_t
decoder8
;
decoder_if_t
decoder8
;
encoder_if_t
encoder
;
encoder_if_t
encoder
;
...
@@ -59,7 +78,6 @@ uint8_t nodecod(short *y,
...
@@ -59,7 +78,6 @@ uint8_t nodecod(short *y,
time_stats_t
*
intl1_stats
,
time_stats_t
*
intl1_stats
,
time_stats_t
*
intl2_stats
)
time_stats_t
*
intl2_stats
)
{
{
printf
(
"."
);
return
max_iterations
+
1
;
return
max_iterations
+
1
;
};
};
...
@@ -70,11 +88,6 @@ void decoding_setmode (int mode) {
...
@@ -70,11 +88,6 @@ void decoding_setmode (int mode) {
decoder16
=
nodecod
;
decoder16
=
nodecod
;
encoder
=
(
encoder_if_t
)
shlib_fdesc
[
ENCODE_C_FPTRIDX
].
fptr
;
encoder
=
(
encoder_if_t
)
shlib_fdesc
[
ENCODE_C_FPTRIDX
].
fptr
;
break
;
break
;
case
MODE_DECODE_SSE
:
decoder8
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD8_SSE_FPTRIDX
].
fptr
;
decoder16
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD16_SSE_FPTRIDX
].
fptr
;
encoder
=
(
encoder_if_t
)
shlib_fdesc
[
ENCODE_SSE_FPTRIDX
].
fptr
;
break
;
case
MODE_DECODE_C
:
case
MODE_DECODE_C
:
decoder16
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD_C_FPTRIDX
].
fptr
;
decoder16
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD_C_FPTRIDX
].
fptr
;
decoder8
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD_C_FPTRIDX
].
fptr
;
decoder8
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD_C_FPTRIDX
].
fptr
;
...
@@ -85,15 +98,22 @@ void decoding_setmode (int mode) {
...
@@ -85,15 +98,22 @@ void decoding_setmode (int mode) {
decoder8
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD8_SSE_FPTRIDX
].
fptr
;
decoder8
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD8_SSE_FPTRIDX
].
fptr
;
encoder
=
(
encoder_if_t
)
shlib_fdesc
[
ENCODE_SSE_FPTRIDX
].
fptr
;
encoder
=
(
encoder_if_t
)
shlib_fdesc
[
ENCODE_SSE_FPTRIDX
].
fptr
;
break
;
break
;
default:
mode
=
MODE_DECODE_SSE
;
case
MODE_DECODE_SSE
:
decoder8
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD8_SSE_FPTRIDX
].
fptr
;
decoder16
=
(
decoder_if_t
)
shlib_fdesc
[
DECODE_TD16_SSE_FPTRIDX
].
fptr
;
encoder
=
(
encoder_if_t
)
shlib_fdesc
[
ENCODE_SSE_FPTRIDX
].
fptr
;
break
;
}
}
curmode
=
mode
;
}
}
int
load_codinglib
(
void
)
{
int
load_codinglib
(
void
)
{
int
ret
;
int
ret
;
memset
(
shlib_fdesc
,
0
,
sizeof
(
shlib_fdesc
));
shlib_fdesc
[
DECODE_INITTD8_SSE_FPTRIDX
].
fname
=
"init_td8"
;
shlib_fdesc
[
DECODE_INITTD8_SSE_FPTRIDX
].
fname
=
"init_td8"
;
shlib_fdesc
[
DECODE_INITTD16_SSE_FPTRIDX
].
fname
=
"init_td16"
;
shlib_fdesc
[
DECODE_INITTD16_SSE_FPTRIDX
].
fname
=
"init_td16"
;
shlib_fdesc
[
DECODE_INITTD_AVX2_FPTRIDX
].
fname
=
"init_td16avx2"
;
shlib_fdesc
[
DECODE_INITTD_AVX2_FPTRIDX
].
fname
=
"init_td16avx2"
;
...
@@ -117,10 +137,18 @@ int load_codinglib(void) {
...
@@ -117,10 +137,18 @@ int load_codinglib(void) {
/* execute encoder/decoder init functions */
/* execute encoder/decoder init functions */
shlib_fdesc
[
DECODE_INITTD8_SSE_FPTRIDX
].
fptr
();
shlib_fdesc
[
DECODE_INITTD8_SSE_FPTRIDX
].
fptr
();
shlib_fdesc
[
DECODE_INITTD16_SSE_FPTRIDX
].
fptr
();
shlib_fdesc
[
DECODE_INITTD16_SSE_FPTRIDX
].
fptr
();
shlib_fdesc
[
DECODE_INITTD_AVX2_FPTRIDX
].
fptr
();
if
(
shlib_fdesc
[
DECODE_INITTD_AVX2_FPTRIDX
].
fptr
!=
NULL
)
{
shlib_fdesc
[
ENCODE_INIT_SSE_FPTRIDX
].
fptr
();
shlib_fdesc
[
DECODE_INITTD_AVX2_FPTRIDX
].
fptr
();
}
if
(
shlib_fdesc
[
ENCODE_INIT_SSE_FPTRIDX
].
fptr
!=
NULL
)
{
shlib_fdesc
[
ENCODE_INIT_SSE_FPTRIDX
].
fptr
();
}
decoding_setmode
(
MODE_DECODE_SSE
);
decoding_setmode
(
MODE_DECODE_SSE
);
/* look for telnet server, if it is loaded, add the coding commands to it */
add_telnetcmd_func_t
addcmd
=
(
add_telnetcmd_func_t
)
get_shlibmodule_fptr
(
"telnetsrv"
,
TELNET_ADDCMD_FNAME
);
if
(
addcmd
!=
NULL
)
{
addcmd
(
"coding"
,
coding_vardef
,
coding_cmdarray
);
}
return
0
;
return
0
;
}
}
...
@@ -132,3 +160,24 @@ void free_codinglib(void) {
...
@@ -132,3 +160,24 @@ void free_codinglib(void) {
}
}
/* functions for telnet support, when telnet server is loaded */
int
coding_setmod_cmd
(
char
*
buff
,
int
debug
,
telnet_printfunc_t
prnt
)
{
if
(
debug
>
0
)
prnt
(
"coding_setmod_cmd received %s
\n
"
,
buff
);
if
(
strcasestr
(
buff
,
"sse"
)
!=
NULL
)
{
decoding_setmode
(
MODE_DECODE_SSE
);
}
else
if
(
strcasestr
(
buff
,
"avx2"
)
!=
NULL
)
{
decoding_setmode
(
MODE_DECODE_AVX2
);
}
else
if
(
strcasestr
(
buff
,
"stdc"
)
!=
NULL
)
{
decoding_setmode
(
MODE_DECODE_C
);
}
else
if
(
strcasestr
(
buff
,
"none"
)
!=
NULL
)
{
decoding_setmode
(
MODE_DECODE_NONE
);
}
else
{
prnt
(
"%s: wrong setmod parameter...
\n
"
,
buff
);
}
prnt
(
"Coding and decoding current mode: %s
\n
"
,
modedesc
[
curmode
]);
return
0
;
}
This diff is collapsed.
Click to expand it.
openair1/PHY/CODING/defs.h
View file @
b04f3b54
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#define CRC8 3
#define CRC8 3
#define MAX_TURBO_ITERATIONS_MBSFN 8
#define MAX_TURBO_ITERATIONS_MBSFN 8
#define MAX_TURBO_ITERATIONS
4
#define MAX_TURBO_ITERATIONS
max_turbo_iterations
#define LTE_NULL 2
#define LTE_NULL 2
...
@@ -294,21 +294,7 @@ void ccodedot11_init_inv(void);
...
@@ -294,21 +294,7 @@ void ccodedot11_init_inv(void);
/*\fn void threegpplte_turbo_encoder(uint8_t *input,uint16_t input_length_bytes,uint8_t *output,uint8_t F,uint16_t interleaver_f1,uint16_t interleaver_f2)
\brief This function implements a rate 1/3 8-state parralel concatenated turbo code (3GPP-LTE).
@param input Pointer to input buffer
@param input_length_bytes Number of bytes to encode
@param output Pointer to output buffer
@param F Number of filler bits at input
@param interleaver_f1 F1 generator
@param interleaver_f2 F2 generator
*/
void
threegpplte_turbo_encoder
(
uint8_t
*
input
,
uint16_t
input_length_bytes
,
uint8_t
*
output
,
uint8_t
F
,
uint16_t
interleaver_f1
,
uint16_t
interleaver_f2
);
/** \fn void ccodelte_encode(int32_t numbits,uint8_t add_crc, uint8_t *inPtr,uint8_t *outPtr,uint16_t rnti)
/** \fn void ccodelte_encode(int32_t numbits,uint8_t add_crc, uint8_t *inPtr,uint8_t *outPtr,uint16_t rnti)
...
@@ -440,95 +426,7 @@ int32_t rate_matching_lte(uint32_t N_coded,
...
@@ -440,95 +426,7 @@ int32_t rate_matching_lte(uint32_t N_coded,
uint32_t
off
);
uint32_t
off
);
/*!
\brief This routine performs max-logmap detection for the 3GPP turbo code (with termination). It is optimized for SIMD processing and 16-bit
LLR arithmetic, and requires SSE2,SSSE3 and SSE4.1 (gcc >=4.3 and appropriate CPU)
@param y LLR input (16-bit precision)
@param decoded_bytes Pointer to decoded output
@param n number of coded bits (including tail bits)
@param max_iterations The maximum number of iterations to perform
@param interleaver_f1 F1 generator
@param interleaver_f2 F2 generator
@param crc_type Length of 3GPPLTE crc (CRC24a,CRC24b,CRC16,CRC8)
@param F Number of filler bits at start of packet
@returns number of iterations used (this is 1+max if incorrect crc or if crc_len=0)
*/
uint8_t
phy_threegpplte_turbo_decoder16
(
int16_t
*
y
,
uint8_t
*
decoded_bytes
,
uint16_t
n
,
uint16_t
interleaver_f1
,
uint16_t
interleaver_f2
,
uint8_t
max_iterations
,
uint8_t
crc_type
,
uint8_t
F
,
time_stats_t
*
init_stats
,
time_stats_t
*
alpha_stats
,
time_stats_t
*
beta_stats
,
time_stats_t
*
gamma_stats
,
time_stats_t
*
ext_stats
,
time_stats_t
*
intl1_stats
,
time_stats_t
*
intl2_stats
);
uint8_t
phy_threegpplte_turbo_decoder16avx2
(
int16_t
*
y
,
int16_t
*
y2
,
uint8_t
*
decoded_bytes
,
uint8_t
*
decoded_bytes2
,
uint16_t
n
,
uint16_t
interleaver_f1
,
uint16_t
interleaver_f2
,
uint8_t
max_iterations
,
uint8_t
crc_type
,
uint8_t
F
,
time_stats_t
*
init_stats
,
time_stats_t
*
alpha_stats
,
time_stats_t
*
beta_stats
,
time_stats_t
*
gamma_stats
,
time_stats_t
*
ext_stats
,
time_stats_t
*
intl1_stats
,
time_stats_t
*
intl2_stats
);
/*!
\brief This routine performs max-logmap detection for the 3GPP turbo code (with termination). It is optimized for SIMD processing and 8-bit
LLR arithmetic, and requires SSE2,SSSE3 and SSE4.1 (gcc >=4.3 and appropriate CPU)
@param y LLR input (16-bit precision)
@param decoded_bytes Pointer to decoded output
@param n number of coded bits (including tail bits)
@param max_iterations The maximum number of iterations to perform
@param interleaver_f1 F1 generator
@param interleaver_f2 F2 generator
@param crc_type Length of 3GPPLTE crc (CRC24a,CRC24b,CRC16,CRC8)
@param F Number of filler bits at start of packet
@returns number of iterations used (this is 1+max if incorrect crc or if crc_len=0)
*/
uint8_t
phy_threegpplte_turbo_decoder8
(
int16_t
*
y
,
uint8_t
*
decoded_bytes
,
uint16_t
n
,
uint16_t
interleaver_f1
,
uint16_t
interleaver_f2
,
uint8_t
max_iterations
,
uint8_t
crc_type
,
uint8_t
F
,
time_stats_t
*
init_stats
,
time_stats_t
*
alpha_stats
,
time_stats_t
*
beta_stats
,
time_stats_t
*
gamma_stats
,
time_stats_t
*
ext_stats
,
time_stats_t
*
intl1_stats
,
time_stats_t
*
intl2_stats
);
uint8_t
phy_threegpplte_turbo_decoder_scalar
(
int16_t
*
y
,
uint8_t
*
decoded_bytes
,
uint16_t
n
,
uint16_t
interleaver_f1
,
uint16_t
interleaver_f2
,
uint8_t
max_iterations
,
uint8_t
crc_type
,
uint8_t
F
,
uint8_t
inst
);
/** @} */
uint32_t
crcbit
(
uint8_t
*
,
uint32_t
crcbit
(
uint8_t
*
,
int32_t
,
int32_t
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/INIT/init_top.c
View file @
b04f3b54
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
/*!\brief Initilization and reconfiguration routines for LTE PHY */
/*!\brief Initilization and reconfiguration routines for LTE PHY */
#include "defs.h"
#include "defs.h"
#include "PHY/extern.h"
#include "PHY/extern.h"
#include "PHY/CODING/extern.h"
void
init_lte_top
(
LTE_DL_FRAME_PARMS
*
frame_parms
)
void
init_lte_top
(
LTE_DL_FRAME_PARMS
*
frame_parms
)
{
{
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
View file @
b04f3b54
...
@@ -207,10 +207,8 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
...
@@ -207,10 +207,8 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
((
ue
->
frame_parms
.
frame_type
==
TDD
)
&&
((
subframe
==
1
)
||
(
subframe
==
6
)))
((
ue
->
frame_parms
.
frame_type
==
TDD
)
&&
((
subframe
==
1
)
||
(
subframe
==
6
)))
)
)
{
// FDD PSS/SSS, compute noise in DTX REs
{
// FDD PSS/SSS, compute noise in DTX REs
if
(
ue
->
frame_parms
.
Ncp
==
NORMAL
)
{
if
(
ue
->
frame_parms
.
Ncp
==
NORMAL
)
{
for
(
aarx
=
0
;
aarx
<
ue
->
frame_parms
.
nb_antennas_rx
;
aarx
++
)
{
for
(
aarx
=
0
;
aarx
<
ue
->
frame_parms
.
nb_antennas_rx
;
aarx
++
)
{
if
(
ue
->
frame_parms
.
frame_type
==
FDD
)
if
(
ue
->
frame_parms
.
frame_type
==
FDD
)
{
{
rxF_sss
=
(
int16_t
*
)
&
ue
->
common_vars
.
common_vars_rx_data_per_thread
[
ue
->
current_thread_id
[
subframe
]].
rxdataF
[
aarx
][(
5
*
ue
->
frame_parms
.
ofdm_symbol_size
)];
rxF_sss
=
(
int16_t
*
)
&
ue
->
common_vars
.
common_vars_rx_data_per_thread
[
ue
->
current_thread_id
[
subframe
]].
rxdataF
[
aarx
][(
5
*
ue
->
frame_parms
.
ofdm_symbol_size
)];
...
@@ -266,7 +264,7 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
...
@@ -266,7 +264,7 @@ void ue_rrc_measurements(PHY_VARS_UE *ue,
ue
->
measurements
.
n0_power_tot_dB
=
(
unsigned
short
)
dB_fixed
(
ue
->
measurements
.
n0_power_tot
/
(
12
*
aarx
));
ue
->
measurements
.
n0_power_tot_dB
=
(
unsigned
short
)
dB_fixed
(
ue
->
measurements
.
n0_power_tot
/
(
12
*
aarx
));
ue
->
measurements
.
n0_power_tot_dBm
=
ue
->
measurements
.
n0_power_tot_dB
-
ue
->
rx_total_gain_dB
-
dB_fixed
(
ue
->
frame_parms
.
ofdm_symbol_size
);
ue
->
measurements
.
n0_power_tot_dBm
=
ue
->
measurements
.
n0_power_tot_dB
-
ue
->
rx_total_gain_dB
-
dB_fixed
(
ue
->
frame_parms
.
ofdm_symbol_size
);
}
else
{
}
else
{
LOG_E
(
PHY
,
"Not yet implemented: noise power calculation when prefix length = EXTENDED
\n
"
);
LOG_E
(
PHY
,
"Not yet implemented: noise power calculation when prefix length =
=
EXTENDED
\n
"
);
}
}
}
}
else
if
((
ue
->
frame_parms
.
frame_type
==
TDD
)
&&
else
if
((
ue
->
frame_parms
.
frame_type
==
TDD
)
&&
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/extern.h
View file @
b04f3b54
...
@@ -126,6 +126,6 @@ extern unsigned short Nb_81_110[8][4];
...
@@ -126,6 +126,6 @@ extern unsigned short Nb_81_110[8][4];
extern
uint16_t
hundred_times_log10_NPRB
[
100
];
extern
uint16_t
hundred_times_log10_NPRB
[
100
];
extern
uint8_t
alpha_lut
[
8
];
extern
uint8_t
alpha_lut
[
8
];
extern
uint8_t
max_turbo_iterations
;
#endif
/*__PHY_EXTERN_H__ */
#endif
/*__PHY_EXTERN_H__ */
This diff is collapsed.
Click to expand it.
openair1/PHY/vars.h
View file @
b04f3b54
...
@@ -149,5 +149,5 @@ int16_t unscrambling_lut[65536*16] __attribute__((aligned(32)));
...
@@ -149,5 +149,5 @@ int16_t unscrambling_lut[65536*16] __attribute__((aligned(32)));
/// lookup table for scrambling in TX
/// lookup table for scrambling in TX
uint8_t
scrambling_lut
[
65536
*
16
]
__attribute__
((
aligned
(
32
)));
uint8_t
scrambling_lut
[
65536
*
16
]
__attribute__
((
aligned
(
32
)));
uint8_t
max_turbo_iterations
=
4
;
#endif
/*__PHY_VARS_H__ */
#endif
/*__PHY_VARS_H__ */
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/L2_interface_ue.c
View file @
b04f3b54
...
@@ -65,6 +65,7 @@ mac_rrc_data_req_ue(
...
@@ -65,6 +65,7 @@ mac_rrc_data_req_ue(
)
)
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
{
{
#ifdef DEBUG_RRC
#ifdef DEBUG_RRC
int
i
;
int
i
;
LOG_I
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%d
\n
"
,
Mod_idP
,
Srb_id
);
LOG_I
(
RRC
,
"[eNB %d] mac_rrc_data_req to SRB ID=%d
\n
"
,
Mod_idP
,
Srb_id
);
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/rrc_UE.c
View file @
b04f3b54
...
@@ -242,6 +242,7 @@ openair_rrc_on_ue(
...
@@ -242,6 +242,7 @@ openair_rrc_on_ue(
{
{
unsigned
short
i
;
unsigned
short
i
;
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" UE?:OPENAIR RRC IN....
\n
"
,
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" UE?:OPENAIR RRC IN....
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
));
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
));
...
@@ -4841,7 +4842,6 @@ rrc_rx_tx_ue(
...
@@ -4841,7 +4842,6 @@ rrc_rx_tx_ue(
)
)
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
{
{
//uint8_t UE_id;
#ifdef LOCALIZATION
#ifdef LOCALIZATION
double
estimated_distance
;
double
estimated_distance
;
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.c
View file @
b04f3b54
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.h
View file @
b04f3b54
...
@@ -129,10 +129,10 @@
...
@@ -129,10 +129,10 @@
{"ue-nb-ant-tx", CONFIG_HLP_UENANTT, 0, u8ptr:&nb_antenna_tx, defuintval:1, TYPE_UINT8, 0}, \
{"ue-nb-ant-tx", CONFIG_HLP_UENANTT, 0, u8ptr:&nb_antenna_tx, defuintval:1, TYPE_UINT8, 0}, \
{"ue-scan-carrier", CONFIG_HLP_UESCAN, PARAMFLAG_BOOL, iptr:&UE_scan_carrier, defintval:0, TYPE_INT, 0}, \
{"ue-scan-carrier", CONFIG_HLP_UESCAN, PARAMFLAG_BOOL, iptr:&UE_scan_carrier, defintval:0, TYPE_INT, 0}, \
{"ue-max-power", NULL, 0, iptr:&(tx_max_power[0]), defintval:90, TYPE_INT, 0}, \
{"ue-max-power", NULL, 0, iptr:&(tx_max_power[0]), defintval:90, TYPE_INT, 0}, \
{"r" , CONFIG_HLP_PRB, 0, u8ptr:&(frame_parms[0]->N_RB_DL), defintval:
0,
TYPE_UINT8, 0}, \
{"r" , CONFIG_HLP_PRB, 0, u8ptr:&(frame_parms[0]->N_RB_DL), defintval:
25,
TYPE_UINT8, 0}, \
}
}
#define DEFAULT_DLF 2680000000
extern
int16_t
dlsch_demod_shift
;
extern
int16_t
dlsch_demod_shift
;
/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
/* command line parameters common to eNodeB and UE */
/* command line parameters common to eNodeB and UE */
...
@@ -155,12 +155,11 @@ extern int16_t dlsch_demod_shift;
...
@@ -155,12 +155,11 @@ extern int16_t dlsch_demod_shift;
{"threadSlot1ProcTwo", NULL, 0, iptr:&(threads.slot1_proc_two), defintval:1, TYPE_INT, 0}, \
{"threadSlot1ProcTwo", NULL, 0, iptr:&(threads.slot1_proc_two), defintval:1, TYPE_INT, 0}, \
{"dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
{"dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
{"A" , CONFIG_HLP_TADV, 0, uptr:&timing_advance, defintval:0, TYPE_UINT, 0}, \
{"A" , CONFIG_HLP_TADV, 0, uptr:&timing_advance, defintval:0, TYPE_UINT, 0}, \
{"C" , CONFIG_HLP_DLF, 0, uptr:&(downlink_frequency[0][0]), defuintval:
2680000000
, TYPE_UINT, 0}, \
{"C" , CONFIG_HLP_DLF, 0, uptr:&(downlink_frequency[0][0]), defuintval:
DEFAULT_DLF
, TYPE_UINT, 0}, \
{"a" , CONFIG_HLP_CHOFF, 0, iptr:&chain_offset, defintval:0, TYPE_INT, 0}, \
{"a" , CONFIG_HLP_CHOFF, 0, iptr:&chain_offset, defintval:0, TYPE_INT, 0}, \
{"d" , CONFIG_HLP_SOFTS, PARAMFLAG_BOOL, uptr:(uint32_t *)&do_forms, defintval:0, TYPE_INT8, 0}, \
{"d" , CONFIG_HLP_SOFTS, PARAMFLAG_BOOL, uptr:(uint32_t *)&do_forms, defintval:0, TYPE_INT8, 0}, \
{"E" , CONFIG_HLP_TQFS, PARAMFLAG_BOOL, i8ptr:&threequarter_fs, defintval:0, TYPE_INT8, 0}, \
{"E" , CONFIG_HLP_TQFS, PARAMFLAG_BOOL, i8ptr:&threequarter_fs, defintval:0, TYPE_INT8, 0}, \
{"K" , CONFIG_HLP_ITTIL, PARAMFLAG_NOFREE, strptr:&itti_dump_file, defstrval:"/tmp/itti.dump", TYPE_STRING, 0}, \
{"K" , CONFIG_HLP_ITTIL, PARAMFLAG_NOFREE, strptr:&itti_dump_file, defstrval:"/tmp/itti.dump", TYPE_STRING, 0}, \
{"U" , CONFIG_HLP_UE, PARAMFLAG_BOOL, i8ptr:&UE_flag, defintval:0, TYPE_INT8, 0}, \
{"m" , CONFIG_HLP_DLMCS, 0, uptr:&target_dl_mcs, defintval:0, TYPE_UINT, 0}, \
{"m" , CONFIG_HLP_DLMCS, 0, uptr:&target_dl_mcs, defintval:0, TYPE_UINT, 0}, \
{"t" , CONFIG_HLP_ULMCS, 0, uptr:&target_ul_mcs, defintval:0, TYPE_UINT, 0}, \
{"t" , CONFIG_HLP_ULMCS, 0, uptr:&target_ul_mcs, defintval:0, TYPE_UINT, 0}, \
{"W" , CONFIG_HLP_L2MONW, 0, strptr:(char **)&in_ip, defstrval:"127.0.0.1", TYPE_STRING, sizeof(in_ip)}, \
{"W" , CONFIG_HLP_L2MONW, 0, strptr:(char **)&in_ip, defstrval:"127.0.0.1", TYPE_STRING, sizeof(in_ip)}, \
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-uesoftmodem.c
0 → 100644
View file @
b04f3b54
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