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
025f56d2
Commit
025f56d2
authored
8 years ago
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
node function interfaces via function pointers. Suggestions from L. Thomas, B. Mongazon, C. Roux.
parent
f33e9a70
develop
1
128-ues
207-feature-ued-platform-support
256_QAM_demod
2cw_fairRRscd
340-fix-beamforming-for-multiple-antenna
342-isip-pcie-lib
375-syrtem-sdr-platform
383-ulsch-scheduler-optimization
387-fraunhofer-iis-transmission-mode-4
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
PerfumeOldTdd
RA_CI_test
RRC-measurements-merge2develop
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-pdcch_order
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
develop-nb-iot-RRC
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-sidekiq
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
enhancement-149-iqtxshift
extend_sharedlibusage
extend_sharedlibusage2
fapi_for_dmrs_and_ptrs
feat-mac-sock
feature-21-TM7
feature-230-tm3_scheduler
feature-247-tm89
feature-247-tm89-fixes
feature-247-tm89-rebased
feature-278-physical-layer-GPU-version
feature-309-phy_procedures_eNB_TX_split_to_multi_threading
feature-330-turbo_decoder_gpu
feature-368-channel-simulator
feature-4g-sched
feature-68-enb-agent
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
gNB_mwc18_integration
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-turbo-decoder-dynamic
isip-turbo-decoder-parallel
isip_nr
issue271_simulator
issue392-simplify-s1-nos1step2_01
issue416_nfapicleanup
issue_345_l2_fapi_simulator
itti-enhancement
l2-fixes
large_scale_simulations
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
mac-monitoring
main_python
master
mbms-fix-develop-nr
merging-2019-w51-to-develop-nr
mex_mmse_receiver
minor-fix-doc-basic-sim
mobipass-hack
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
oai_ue_mwc18_integration
oairu
oairu-dockerfile-support
oc-docker-october-improvements
ocp_simulator
openxg/develop
pdcp-benchmark
pdsch-ch-est
polar8
preprocessor_refactor-2
ptrs_rrc_config
pucch2ab
pucchsim-multiue
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
rru-txwrite-modification
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
schedule-si-fix
signal-delay
small-bugfixes-w40
small-config-change
smallcleanup
softmodem_cleanup
split73
tcri
test-x310-perf
testing_2symb_pdcch
testing_with_external_txdata
thread-pool
tm7-iris
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
ues_test_tmp
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-ho
x2-ka-test
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
2018.w09
2018.w08
2018.w07
2018.w06
2018.w05
2018.w04
2018.w03
2018.w02
2017.w48
2017.w46
2017.w43
2017.w42
2017.w34
2017.w30
2017.w25
2017.w24
2017.w22
2017.w20
2017.w19
2017.w15
2017.w14
2017.w13
2017.w12
2017.w11
2017.w10
2017.w09
2017.w08
2017.w07
2017.w06
2017.w05
2017.w04
2017.w03
2017.w02
2017.w01
2016.w50
2016.w49
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
v1B0.8
v1B0.7
v1B0.6
v1B0.5
v1B0.4
v1B0.3
v1B0.2
v1B0.1
v0.6.1
v0.6.1_tdd
v0.6
v0.5.1_tdd
v0.5
v0.4
v0.3
v0.2
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
18
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
787 additions
and
723 deletions
+787
-723
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_init.c
+10
-10
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+52
-46
openair1/PHY/LTE_TRANSPORT/if4_tools.h
openair1/PHY/LTE_TRANSPORT/if4_tools.h
+13
-13
openair1/PHY/LTE_TRANSPORT/if5_tools.c
openair1/PHY/LTE_TRANSPORT/if5_tools.c
+9
-1
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/phich.c
+2
-3
openair1/PHY/LTE_TRANSPORT/pmch.c
openair1/PHY/LTE_TRANSPORT/pmch.c
+4
-4
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/prach.c
+5
-7
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/LTE_TRANSPORT/proto.h
+3
-6
openair1/PHY/defs.h
openair1/PHY/defs.h
+26
-14
openair1/SCHED/defs.h
openair1/SCHED/defs.h
+6
-11
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+137
-151
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+6
-4
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
+16
-16
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+16
-16
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
+4
-4
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
+6
-6
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+468
-407
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+4
-4
No files found.
openair1/PHY/INIT/lte_init.c
View file @
025f56d2
...
...
@@ -1167,7 +1167,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
frame_parms
->
phich_config_common
.
phich_duration
);
LOG_D
(
PHY
,
"[MSC_NEW][FRAME 00000][PHY_eNB][MOD %02"
PRIu8
"][]
\n
"
,
eNB
->
Mod_id
);
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
)
{
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
p5
)
{
lte_gold
(
frame_parms
,
eNB
->
lte_gold_table
,
frame_parms
->
Nid_cell
);
generate_pcfich_reg_mapping
(
frame_parms
);
generate_phich_reg_mapping
(
frame_parms
);
...
...
@@ -1191,12 +1191,12 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
if
(
abstraction_flag
==
0
)
{
// TX vars
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
)
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
p5
)
common_vars
->
txdata
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
frame_parms
->
nb_antennas_tx
*
sizeof
(
int32_t
*
)
);
common_vars
->
txdataF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
frame_parms
->
nb_antennas_tx
*
sizeof
(
int32_t
*
)
);
for
(
i
=
0
;
i
<
frame_parms
->
nb_antennas_tx
;
i
++
)
{
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
)
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
p5
)
common_vars
->
txdata
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES
*
sizeof
(
int32_t
)
);
common_vars
->
txdataF
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES_NO_PREFIX
*
sizeof
(
int32_t
)
);
#ifdef DEBUG_PHY
...
...
@@ -1208,14 +1208,14 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
}
// RX vars
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
)
{
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
p5
)
{
common_vars
->
rxdata
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
frame_parms
->
nb_antennas_rx
*
sizeof
(
int32_t
*
)
);
common_vars
->
rxdata_7_5kHz
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
frame_parms
->
nb_antennas_rx
*
sizeof
(
int32_t
*
)
);
}
common_vars
->
rxdataF
[
eNB_id
]
=
(
int32_t
**
)
malloc16
(
frame_parms
->
nb_antennas_rx
*
sizeof
(
int32_t
*
)
);
for
(
i
=
0
;
i
<
frame_parms
->
nb_antennas_rx
;
i
++
)
{
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
)
{
if
(
eNB
->
node_function
!=
NGFI_RCC_IF4
p5
)
{
common_vars
->
rxdata
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
FRAME_LENGTH_COMPLEX_SAMPLES
*
sizeof
(
int32_t
)
);
common_vars
->
rxdata_7_5kHz
[
eNB_id
][
i
]
=
(
int32_t
*
)
malloc16_clear
(
frame_parms
->
samples_per_tti
*
sizeof
(
int32_t
)
);
}
...
...
@@ -1227,7 +1227,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
#endif
}
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
)
{
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
p5
)
{
// Channel estimates for SRS
for
(
UE_id
=
0
;
UE_id
<
NUMBER_OF_UE_MAX
;
UE_id
++
)
{
...
...
@@ -1250,7 +1250,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
if
(
abstraction_flag
==
0
)
{
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
)
{
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
p5
)
{
generate_ul_ref_sigs_rx
();
// SRS
...
...
@@ -1264,7 +1264,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
// ULSCH VARS, skip if NFGI_RRU_IF4
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
)
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
p5
)
prach_vars
->
prachF
=
(
int16_t
*
)
malloc16_clear
(
1024
*
2
*
sizeof
(
int16_t
)
);
/* number of elements of an array X is computed as sizeof(X) / sizeof(X[0]) */
...
...
@@ -1277,7 +1277,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
#endif
}
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
)
{
if
(
eNB
->
node_function
!=
NGFI_RRU_IF4
p5
)
{
AssertFatal
(
frame_parms
->
nb_antennas_rx
<=
sizeof
(
prach_vars
->
prach_ifft
)
/
sizeof
(
prach_vars
->
prach_ifft
[
0
]),
"nb_antennas_rx too large"
);
for
(
i
=
0
;
i
<
frame_parms
->
nb_antennas_rx
;
i
++
)
{
...
...
@@ -1399,7 +1399,7 @@ int phy_init_lte_eNB(PHY_VARS_eNB *eNB,
eNB
->
pdsch_config_dedicated
->
p_a
=
dB0
;
//defaul value until overwritten by RRCConnectionReconfiguration
init_prach_tables
(
839
);
}
// node_function != NGFI_RRU_IF4
}
// node_function != NGFI_RRU_IF4
p5
return
(
0
);
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @
025f56d2
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/if4_tools.h
View file @
025f56d2
...
...
@@ -41,12 +41,12 @@
#include "PHY/defs.h"
/// Macro for IF4 packet type
#define IF4_PACKET_TYPE 0x080A
#define IF4_PULFFT 0x0019
#define IF4_PDLFFT 0x0020
#define IF4_PRACH 0x0021
#define IF4
p5
_PACKET_TYPE 0x080A
#define IF4
p5
_PULFFT 0x0019
#define IF4
p5
_PDLFFT 0x0020
#define IF4
p5
_PRACH 0x0021
struct
IF4_header
{
struct
IF4
p5
_header
{
/// Type
uint16_t
type
;
/// Sub-Type
...
...
@@ -58,17 +58,17 @@ struct IF4_header {
}
__attribute__
((
__packed__
));
typedef
struct
IF4
_header
IF4
_header_t
;
#define sizeof_IF4_header_t 12
typedef
struct
IF4
p5_header
IF4p5
_header_t
;
#define sizeof_IF4
p5
_header_t 12
void
gen_IF4
_dl_header
(
IF4
_header_t
*
,
int
,
int
);
void
gen_IF4
p5_dl_header
(
IF4p5
_header_t
*
,
int
,
int
);
void
gen_IF4
_ul_header
(
IF4
_header_t
*
,
int
,
int
);
void
gen_IF4
p5_ul_header
(
IF4p5
_header_t
*
,
int
,
int
);
void
gen_IF4
_prach_header
(
IF4
_header_t
*
,
int
,
int
);
void
gen_IF4
p5_prach_header
(
IF4p5
_header_t
*
,
int
,
int
);
void
send_IF4
(
PHY_VARS_eNB
*
,
int
,
int
,
uint16_t
,
int
);
void
send_IF4
p5
(
PHY_VARS_eNB
*
,
int
,
int
,
uint16_t
,
int
);
void
recv_IF4
(
PHY_VARS_eNB
*
,
int
*
,
int
*
,
uint16_t
*
,
uint32_t
*
);
void
recv_IF4
p5
(
PHY_VARS_eNB
*
,
int
*
,
int
*
,
uint16_t
*
,
uint32_t
*
);
void
malloc_IF4_buffer
(
PHY_VARS_eNB
*
);
void
malloc_IF4
p5
_buffer
(
PHY_VARS_eNB
*
);
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/if5_tools.c
View file @
025f56d2
...
...
@@ -41,7 +41,7 @@
#include "PHY/defs.h"
#include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
#include "UTIL/LOG/vcd_signal_dumper.h"
void
send_IF5
(
PHY_VARS_eNB
*
eNB
,
openair0_timestamp
proc_timestamp
,
int
subframe
,
uint8_t
*
seqno
,
uint16_t
packet_type
)
{
...
...
@@ -54,6 +54,8 @@ void send_IF5(PHY_VARS_eNB *eNB, openair0_timestamp proc_timestamp, int subframe
uint32_t
spp_eth
=
(
uint32_t
)
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_packet
;
uint32_t
spsf
=
(
uint32_t
)
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF5
,
1
);
if
(
packet_type
==
IF5_RRH_GW_DL
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_tx
;
i
++
)
...
...
@@ -143,6 +145,8 @@ void send_IF5(PHY_VARS_eNB *eNB, openair0_timestamp proc_timestamp, int subframe
}
free
(
tx_buffer
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF5
,
0
);
return
;
}
...
...
@@ -158,6 +162,8 @@ void recv_IF5(PHY_VARS_eNB *eNB, openair0_timestamp *proc_timestamp, int subfram
int32_t
spsf
=
(
int32_t
)
eNB
->
ifdevice
.
openair0_cfg
->
samples_per_frame
/
10
;
openair0_timestamp
timestamp
[
spsf
/
spp_eth
];
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF5
,
1
);
if
(
packet_type
==
IF5_RRH_GW_DL
)
{
...
...
@@ -205,6 +211,8 @@ void recv_IF5(PHY_VARS_eNB *eNB, openair0_timestamp *proc_timestamp, int subfram
}
else
{
AssertFatal
(
1
==
0
,
"recv_IF5 - Unknown packet_type %x"
,
packet_type
);
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF5
,
0
);
return
;
}
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/phich.c
View file @
025f56d2
...
...
@@ -1424,8 +1424,7 @@ void rx_phich(PHY_VARS_UE *ue,
void
generate_phich_top
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
int16_t
amp
,
uint8_t
sect_id
,
uint8_t
abstraction_flag
)
uint8_t
sect_id
)
{
...
...
@@ -1486,7 +1485,7 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
first_rb
);
}
if
(
abstraction_flag
==
0
)
{
if
(
eNB
->
abstraction_flag
==
0
)
{
generate_phich
(
frame_parms
,
amp
,
//amp*2,
nseq_PHICH
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/pmch.c
View file @
025f56d2
...
...
@@ -190,7 +190,7 @@ int is_pmch_subframe(uint32_t frame, int subframe, LTE_DL_FRAME_PARMS *frame_par
return
(
0
);
}
void
fill_eNB_dlsch_MCH
(
PHY_VARS_eNB
*
eNB
,
int
mcs
,
int
ndi
,
int
rvidx
,
int
abstraction_flag
)
void
fill_eNB_dlsch_MCH
(
PHY_VARS_eNB
*
eNB
,
int
mcs
,
int
ndi
,
int
rvidx
)
{
LTE_eNB_DLSCH_t
*
dlsch
=
eNB
->
dlsch_MCH
;
...
...
@@ -227,7 +227,7 @@ void fill_eNB_dlsch_MCH(PHY_VARS_eNB *eNB,int mcs,int ndi,int rvidx, int abstrac
break
;
}
if
(
abstraction_flag
)
{
if
(
eNB
->
abstraction_flag
)
{
eNB_transport_info
[
eNB
->
Mod_id
][
eNB
->
CC_id
].
cntl
.
pmch_flag
=
1
;
eNB_transport_info
[
eNB
->
Mod_id
][
eNB
->
CC_id
].
num_pmch
=
1
;
// assumption: there is always one pmch in each SF
eNB_transport_info
[
eNB
->
Mod_id
][
eNB
->
CC_id
].
num_common_dci
=
0
;
...
...
@@ -286,13 +286,13 @@ void fill_UE_dlsch_MCH(PHY_VARS_UE *ue,int mcs,int ndi,int rvidx,int eNB_id)
}
}
void
generate_mch
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
uint8_t
*
a
,
int
abstraction_flag
)
void
generate_mch
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
uint8_t
*
a
)
{
int
G
;
int
subframe
=
proc
->
subframe_tx
;
if
(
abstraction_flag
!=
0
)
{
if
(
eNB
->
abstraction_flag
!=
0
)
{
if
(
eNB_transport_info_TB_index
[
eNB
->
Mod_id
][
eNB
->
CC_id
]
!=
0
)
printf
(
"[PHY][EMU] PMCH transport block position is different than zero %d
\n
"
,
eNB_transport_info_TB_index
[
eNB
->
Mod_id
][
eNB
->
CC_id
]);
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/prach.c
View file @
025f56d2
...
...
@@ -1183,7 +1183,7 @@ void rx_prach(PHY_VARS_eNB *eNB,
if
((
eNB
->
node_function
==
eNodeB_3GPP
)
||
(
eNB
->
node_function
==
NGFI_RRU_IF4
))
{
// compute the DFTs of the PRACH temporal resources
(
eNB
->
node_function
==
NGFI_RRU_IF4
p5
))
{
// compute the DFTs of the PRACH temporal resources
// Do forward transform
for
(
aa
=
0
;
aa
<
nb_ant_rx
;
aa
++
)
{
prach2
=
prach
[
aa
]
+
(
Ncp
<<
1
);
...
...
@@ -1269,7 +1269,7 @@ void rx_prach(PHY_VARS_eNB *eNB,
}
}
if
(
eNB
->
node_function
==
NGFI_RRU_IF4
)
{
if
(
eNB
->
node_function
==
NGFI_RRU_IF4
p5
)
{
k
=
(
12
*
n_ra_prb
)
-
6
*
eNB
->
frame_parms
.
N_RB_UL
;
if
(
k
<
0
)
{
...
...
@@ -1281,12 +1281,10 @@ void rx_prach(PHY_VARS_eNB *eNB,
k
*=
2
;
/// **** send_IF4 of rxsigF to RCC **** ///
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4
,
1
);
send_IF4
(
eNB
,
eNB
->
proc
.
frame_rx
,
eNB
->
proc
.
subframe_rx
,
IF4_PRACH
,
k
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4
,
0
);
send_IF4p5
(
eNB
,
eNB
->
proc
.
frame_rx
,
eNB
->
proc
.
subframe_rx
,
IF4p5_PRACH
,
k
);
return
;
}
else
if
(
eNB
->
node_function
==
NGFI_RCC_IF4
)
{
}
else
if
(
eNB
->
node_function
==
NGFI_RCC_IF4
p5
)
{
k
=
(
12
*
n_ra_prb
)
-
6
*
eNB
->
frame_parms
.
N_RB_UL
;
if
(
k
<
0
)
{
...
...
@@ -1305,7 +1303,7 @@ void rx_prach(PHY_VARS_eNB *eNB,
// in case of RCC and prach received rx_thread wakes up prach
// here onwards is for eNodeB_3GPP or NGFI_RCC_IF4
// here onwards is for eNodeB_3GPP or NGFI_RCC_IF4
p5
preamble_offset_old
=
99
;
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/proto.h
View file @
025f56d2
...
...
@@ -232,7 +232,7 @@ int mch_modulation(int32_t **txdataF,
@param abstraction_flag
*/
void
generate_mch
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
uint8_t
*
a
,
int
abstraction_flag
);
void
generate_mch
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
uint8_t
*
a
);
/** \brief This function generates the frequency-domain pilots (cell-specific downlink reference signals)
@param phy_vars_eNB Pointer to eNB variables
...
...
@@ -240,10 +240,8 @@ void generate_mch(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_t *proc,uint8_t *a,in
@param mcs MCS for MBSFN
@param ndi new data indicator
@param rdvix
@param abstraction_flag
*/
void
fill_eNB_dlsch_MCH
(
PHY_VARS_eNB
*
phy_vars_eNB
,
int
mcs
,
int
ndi
,
int
rvidx
,
int
abstraction_flag
);
void
fill_eNB_dlsch_MCH
(
PHY_VARS_eNB
*
phy_vars_eNB
,
int
mcs
,
int
ndi
,
int
rvidx
);
/** \brief This function generates the frequency-domain pilots (cell-specific downlink reference signals)
@param phy_vars_ue Pointer to UE variables
...
...
@@ -1546,8 +1544,7 @@ uint32_t ulsch_decoding_emul(PHY_VARS_eNB *phy_vars_eNB,
void
generate_phich_top
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
int16_t
amp
,
uint8_t
sect_id
,
uint8_t
abstraction_flag
);
uint8_t
sect_id
);
/* \brief This routine demodulates the PHICH and updates PUSCH/ULSCH parameters.
@param phy_vars_ue Pointer to UE variables
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/defs.h
View file @
025f56d2
...
...
@@ -161,8 +161,9 @@ typedef enum {
eNodeB_3GPP
=
0
,
// classical eNodeB function
eNodeB_3GPP_BBU
,
// eNodeB with NGFI IF5
NGFI_RRU_IF5
,
// NGFI_RRU with IF5
NGFI_RRU_IF4
,
// NGFI_RRU (NGFI remote radio-unit, currently split at common - ue_specific interface, IF4)
NGFI_RCC_IF4
// NGFI_RCC (NGFI radio cloud center, currently split at common - ue_specific interface, IF4)
NGFI_RRU_IF4p5
,
// NGFI_RRU (NGFI remote radio-unit, currently split at common - ue_specific interface, IF4p5)
NGFI_RCC_IF4p5
,
// NGFI_RCC (NGFI radio cloud center, currently split at common - ue_specific interface, IF4p5)
NGFI_RAU_IF4p5
}
eNB_func_t
;
typedef
enum
{
...
...
@@ -187,6 +188,20 @@ typedef struct ral_threshold_phy_s {
}
ral_threshold_phy_t
;
#endif
/// Top-level PHY Data Structure for RN
typedef
struct
{
/// Module ID indicator for this instance
uint8_t
Mod_id
;
uint32_t
frame
;
// phy_vars_eNB
// phy_vars ue
// cuurently only used to store and forward the PMCH
uint8_t
mch_avtive
[
10
];
uint8_t
sync_area
[
10
];
// num SF
LTE_UE_DLSCH_t
*
dlsch_rn_MCH
[
10
];
}
PHY_VARS_RN
;
/// Context data structure for RX/TX portion of subframe processing
typedef
struct
{
/// Component Carrier index
...
...
@@ -340,6 +355,15 @@ typedef struct PHY_VARS_eNB_s {
eNB_proc_t
proc
;
eNB_func_t
node_function
;
eNB_timing_t
node_timing
;
int
abstraction_flag
;
void
(
*
do_prach
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_proc_t
*
proc
);
void
(
*
fep
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_proc_t
*
proc
);
void
(
*
proc_uespec_rx
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
const
relaying_type_t
r_type
);
void
(
*
proc_tx
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
relaying_type_t
r_type
,
PHY_VARS_RN
*
rn
);
void
(
*
tx_fh
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
);
void
(
*
rx_fh
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_proc_t
*
proc
,
int
*
frame
,
int
*
subframe
);
int
(
*
start_rf
)(
struct
PHY_VARS_eNB_s
*
eNB
);
int
(
*
start_if
)(
struct
PHY_VARS_eNB_s
*
eNB
);
uint8_t
local_flag
;
uint32_t
rx_total_gain_dB
;
LTE_DL_FRAME_PARMS
frame_parms
;
...
...
@@ -785,19 +809,7 @@ typedef struct {
#endif
}
PHY_VARS_UE
;
/// Top-level PHY Data Structure for RN
typedef
struct
{
/// Module ID indicator for this instance
uint8_t
Mod_id
;
uint32_t
frame
;
// phy_vars_eNB
// phy_vars ue
// cuurently only used to store and forward the PMCH
uint8_t
mch_avtive
[
10
];
uint8_t
sync_area
[
10
];
// num SF
LTE_UE_DLSCH_t
*
dlsch_rn_MCH
[
10
];
}
PHY_VARS_RN
;
#include "PHY/INIT/defs.h"
#include "PHY/LTE_REFSIG/defs.h"
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED/defs.h
View file @
025f56d2
...
...
@@ -164,20 +164,18 @@ void phy_procedures_UE_S_RX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abst
@param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
@param phy_vars_rn pointer to the RN variables
*/
void
phy_procedures_eNB_TX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
uint8_t
abstraction_flag
,
relaying_type_t
r_type
,
PHY_VARS_RN
*
phy_vars_rn
);
void
phy_procedures_eNB_TX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
relaying_type_t
r_type
,
PHY_VARS_RN
*
phy_vars_rn
);
/*! \brief Scheduling for eNB RX UE-specific procedures in normal subframes.
@param phy_vars_eNB Pointer to eNB variables on which to act
@param proc Pointer to RXn-TXnp4 proc information
@param abstraction_flag Indicator of PHY abstraction
@param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
*/
void
phy_procedures_eNB_uespec_RX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
uint8_t
abstraction_flag
,
relaying_type_t
r_type
);
void
phy_procedures_eNB_uespec_RX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
relaying_type_t
r_type
);
/*! \brief Scheduling for eNB TX procedures in TDD S-subframes.
@param phy_vars_eNB Pointer to eNB variables on which to act
@param proc Pointer to RXn-TXnp4 proc information
@param abstraction_flag Indicator of PHY abstraction
@param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
*/
...
...
@@ -185,29 +183,26 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *phy_vars_eNB,eNB_rxtx_proc_t *pr
@param phy_vars_eNB Pointer to eNB variables on which to act
@param abstraction_flag Indicator of PHY abstraction
*/
void
phy_procedures_eNB_common_RX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
uint8_t
abstraction_flag
);
void
phy_procedures_eNB_common_RX
(
PHY_VARS_eNB
*
phy_vars_eNB
);
/*! \brief Scheduling for eNB TX procedures in TDD S-subframes.
@param phy_vars_eNB Pointer to eNB variables on which to act
@param abstraction_flag Indicator of PHY abstraction
@param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
*/
void
phy_procedures_eNB_S_TX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
uint8_t
abstraction_flag
,
relaying_type_t
r_type
);
void
phy_procedures_eNB_S_TX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
relaying_type_t
r_type
);
/*! \brief Scheduling for eNB RX procedures in TDD S-subframes.
@param phy_vars_eNB Pointer to eNB variables on which to act
@param abstraction_flag Indicator of PHY abstraction
@param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
*/
void
phy_procedures_eNB_S_RX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
uint8_t
abstraction_flag
,
relaying_type_t
r_type
);
void
phy_procedures_eNB_S_RX
(
PHY_VARS_eNB
*
phy_vars_eNB
,
eNB_rxtx_proc_t
*
proc
,
relaying_type_t
r_type
);
/*! \brief Scheduling for eNB PRACH RX procedures
@param phy_vars_eNB Pointer to eNB variables on which to act
@param proc Pointer to RXn-TXnp4 proc information
@param abstraction_flag Indicator of PHY abstraction
*/
void
prach_procedures
(
PHY_VARS_eNB
*
eNB
,
uint8_t
abstraction_flag
);
void
prach_procedures
(
PHY_VARS_eNB
*
eNB
);
/*! \brief Function to compute subframe type as a function of Frame type and TDD Configuration (implements Table 4.2.2 from 36.211, p.11 from version 8.6) and subframe index.
@param frame_parms Pointer to DL frame parameter descriptor
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
025f56d2
This diff is collapsed.
Click to expand it.
openair2/ENB_APP/enb_config.c
View file @
025f56d2
...
...
@@ -887,10 +887,12 @@ const Enb_properties_array_t *enb_config_init(char* lib_config_file_name_pP)
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
eNodeB_3GPP
;
}
else
if
(
strcmp
(
cc_node_function
,
"eNodeB_3GPP_BBU"
)
==
0
)
{
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
eNodeB_3GPP_BBU
;
}
else
if
(
strcmp
(
cc_node_function
,
"NGFI_RCC_IF4"
)
==
0
)
{
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
NGFI_RCC_IF4
;
}
else
if
(
strcmp
(
cc_node_function
,
"NGFI_RRU_IF4"
)
==
0
)
{
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
NGFI_RRU_IF4
;
}
else
if
(
strcmp
(
cc_node_function
,
"NGFI_RCC_IF4p5"
)
==
0
)
{
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
NGFI_RCC_IF4p5
;
}
else
if
(
strcmp
(
cc_node_function
,
"NGFI_RAU_IF4p5"
)
==
0
)
{
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
NGFI_RAU_IF4p5
;
}
else
if
(
strcmp
(
cc_node_function
,
"NGFI_RRU_IF4p5"
)
==
0
)
{
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
NGFI_RRU_IF4p5
;
}
else
if
(
strcmp
(
cc_node_function
,
"NGFI_RRU_IF5"
)
==
0
)
{
enb_properties
.
properties
[
enb_properties_index
]
->
cc_node_function
[
j
]
=
NGFI_RRU_IF5
;
}
else
{
...
...
This diff is collapsed.
Click to expand it.
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
View file @
025f56d2
...
...
@@ -201,7 +201,7 @@ int trx_eth_write_raw(openair0_device *device, openair0_timestamp timestamp, voi
int
trx_eth_write_raw_IF4
(
openair0_device
*
device
,
openair0_timestamp
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
,
int
flags
)
{
int
trx_eth_write_raw_IF4
p5
(
openair0_device
*
device
,
openair0_timestamp
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
,
int
flags
)
{
int
nblocks
=
nsamps
;
int
bytes_sent
=
0
;
...
...
@@ -211,14 +211,14 @@ int trx_eth_write_raw_IF4(openair0_device *device, openair0_timestamp timestamp,
ssize_t
packet_size
;
if
(
flags
==
IF4_PDLFFT
)
{
packet_size
=
RAW_IF4_PDLFFT_SIZE_BYTES
(
nblocks
);
}
else
if
(
flags
==
IF4_PULFFT
)
{
packet_size
=
RAW_IF4_PULFFT_SIZE_BYTES
(
nblocks
);
if
(
flags
==
IF4
p5
_PDLFFT
)
{
packet_size
=
RAW_IF4
p5
_PDLFFT_SIZE_BYTES
(
nblocks
);
}
else
if
(
flags
==
IF4
p5
_PULFFT
)
{
packet_size
=
RAW_IF4
p5
_PULFFT_SIZE_BYTES
(
nblocks
);
}
else
if
(
flags
==
IF5_MOBIPASS
)
{
packet_size
=
RAW_IF5_MOBIPASS_SIZE_BYTES
;
}
else
{
packet_size
=
RAW_IF4_PRACH_SIZE_BYTES
;
packet_size
=
RAW_IF4
p5
_PRACH_SIZE_BYTES
;
}
eth
->
tx_nsamps
=
nblocks
;
...
...
@@ -304,7 +304,7 @@ int trx_eth_read_raw(openair0_device *device, openair0_timestamp *timestamp, voi
int
trx_eth_read_raw_IF4
(
openair0_device
*
device
,
openair0_timestamp
*
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
)
{
int
trx_eth_read_raw_IF4
p5
(
openair0_device
*
device
,
openair0_timestamp
*
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
)
{
// Read nblocks info from packet itself
int
nblocks
=
nsamps
;
...
...
@@ -312,8 +312,8 @@ int trx_eth_read_raw_IF4(openair0_device *device, openair0_timestamp *timestamp,
eth_state_t
*
eth
=
(
eth_state_t
*
)
device
->
priv
;
int
Mod_id
=
device
->
Mod_id
;
ssize_t
packet_size
=
MAC_HEADER_SIZE_BYTES
+
sizeof_IF4_header_t
;
IF4
_header_t
*
test_header
=
(
IF4
_header_t
*
)(
buff
[
0
]
+
MAC_HEADER_SIZE_BYTES
);
ssize_t
packet_size
=
MAC_HEADER_SIZE_BYTES
+
sizeof_IF4
p5
_header_t
;
IF4
p5_header_t
*
test_header
=
(
IF4p5
_header_t
*
)(
buff
[
0
]
+
MAC_HEADER_SIZE_BYTES
);
bytes_received
=
recv
(
eth
->
sockfd
[
Mod_id
],
buff
[
0
],
...
...
@@ -327,12 +327,12 @@ int trx_eth_read_raw_IF4(openair0_device *device, openair0_timestamp *timestamp,
*
timestamp
=
test_header
->
sub_type
;
if
(
test_header
->
sub_type
==
IF4_PDLFFT
)
{
packet_size
=
RAW_IF4_PDLFFT_SIZE_BYTES
(
nblocks
);
}
else
if
(
test_header
->
sub_type
==
IF4_PULFFT
)
{
packet_size
=
RAW_IF4_PULFFT_SIZE_BYTES
(
nblocks
);
if
(
test_header
->
sub_type
==
IF4
p5
_PDLFFT
)
{
packet_size
=
RAW_IF4
p5
_PDLFFT_SIZE_BYTES
(
nblocks
);
}
else
if
(
test_header
->
sub_type
==
IF4
p5
_PULFFT
)
{
packet_size
=
RAW_IF4
p5
_PULFFT_SIZE_BYTES
(
nblocks
);
}
else
{
packet_size
=
RAW_IF4_PRACH_SIZE_BYTES
;
packet_size
=
RAW_IF4
p5
_PRACH_SIZE_BYTES
;
}
while
(
bytes_received
<
packet_size
)
{
...
...
@@ -387,7 +387,7 @@ int eth_set_dev_conf_raw(openair0_device *device) {
int
eth_set_dev_conf_raw_IF4
(
openair0_device
*
device
)
{
int
eth_set_dev_conf_raw_IF4
p5
(
openair0_device
*
device
)
{
// use for cc_id info
int
Mod_id
=
device
->
Mod_id
;
...
...
@@ -448,7 +448,7 @@ int eth_get_dev_conf_raw(openair0_device *device) {
}
int
eth_get_dev_conf_raw_IF4
(
openair0_device
*
device
)
{
int
eth_get_dev_conf_raw_IF4
p5
(
openair0_device
*
device
)
{
// use for cc_id info
eth_state_t
*
eth
=
(
eth_state_t
*
)
device
->
priv
;
...
...
This diff is collapsed.
Click to expand it.
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
View file @
025f56d2
...
...
@@ -73,27 +73,27 @@ int trx_eth_start(openair0_device *device) {
/* adjust MTU wrt number of samples per packet */
if
(
ethernet_tune
(
device
,
MTU_SIZE
,
RAW_PACKET_SIZE_BYTES
(
device
->
openair0_cfg
->
samples_per_packet
))
!=
0
)
return
-
1
;
}
else
if
(
eth
->
flags
==
ETH_RAW_IF4_MODE
)
{
}
else
if
(
eth
->
flags
==
ETH_RAW_IF4
p5
_MODE
)
{
if
(
eth_socket_init_raw
(
device
)
!=
0
)
return
-
1
;
/* RRH gets openair0 device configuration - BBU sets openair0 device configuration*/
if
(
device
->
host_type
==
BBU_HOST
)
{
if
(
eth_set_dev_conf_raw_IF4
(
device
)
!=
0
)
return
-
1
;
if
(
eth_set_dev_conf_raw_IF4
p5
(
device
)
!=
0
)
return
-
1
;
}
else
{
if
(
eth_get_dev_conf_raw_IF4
(
device
)
!=
0
)
return
-
1
;
if
(
eth_get_dev_conf_raw_IF4
p5
(
device
)
!=
0
)
return
-
1
;
}
/* adjust MTU wrt number of samples per packet */
if
(
ethernet_tune
(
device
,
MTU_SIZE
,
RAW_IF4_PRACH_SIZE_BYTES
)
!=
0
)
return
-
1
;
if
(
ethernet_tune
(
device
,
MTU_SIZE
,
RAW_IF4
p5
_PRACH_SIZE_BYTES
)
!=
0
)
return
-
1
;
}
else
if
(
eth
->
flags
==
ETH_UDP_IF4_MODE
)
{
}
else
if
(
eth
->
flags
==
ETH_UDP_IF4
p5
_MODE
)
{
}
else
if
(
eth
->
flags
==
ETH_RAW_IF5_MOBIPASS
)
{
if
(
eth_socket_init_raw
(
device
)
!=
0
)
return
-
1
;
/* RRH gets openair0 device configuration - BBU sets openair0 device configuration*/
//if (device->host_type == BBU_HOST) {
//if(eth_set_dev_conf_raw_IF4(device)!=0) return -1;
//if(eth_set_dev_conf_raw_IF4
p5
(device)!=0) return -1;
//} else {
//if(eth_get_dev_conf_raw_IF4(device)!=0) return -1;
//if(eth_get_dev_conf_raw_IF4
p5
(device)!=0) return -1;
//
/* adjust MTU wrt number of samples per packet */
// if(ethernet_tune (device,MTU_SIZE,RAW_PACKET_SIZE_BYTES(device->openair0_cfg->samples_per_packet))!=0) return -1;
...
...
@@ -339,9 +339,9 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth
}
else
if
(
eth_params
->
transp_preference
==
0
)
{
eth
->
flags
=
ETH_UDP_MODE
;
}
else
if
(
eth_params
->
transp_preference
==
3
)
{
eth
->
flags
=
ETH_RAW_IF4_MODE
;
eth
->
flags
=
ETH_RAW_IF4
p5
_MODE
;
}
else
if
(
eth_params
->
transp_preference
==
2
)
{
eth
->
flags
=
ETH_UDP_IF4_MODE
;
eth
->
flags
=
ETH_UDP_IF4
p5
_MODE
;
}
else
if
(
eth_params
->
transp_preference
==
4
)
{
eth
->
flags
=
ETH_RAW_IF5_MOBIPASS
;
}
else
{
...
...
@@ -368,15 +368,15 @@ int transport_init(openair0_device *device, openair0_config_t *openair0_cfg, eth
}
else
if
(
eth
->
flags
==
ETH_UDP_MODE
)
{
device
->
trx_write_func
=
trx_eth_write_udp
;
device
->
trx_read_func
=
trx_eth_read_udp
;
}
else
if
(
eth
->
flags
==
ETH_RAW_IF4_MODE
)
{
device
->
trx_write_func
=
trx_eth_write_raw_IF4
;
device
->
trx_read_func
=
trx_eth_read_raw_IF4
;
}
else
if
(
eth
->
flags
==
ETH_RAW_IF4
p5
_MODE
)
{
device
->
trx_write_func
=
trx_eth_write_raw_IF4
p5
;
device
->
trx_read_func
=
trx_eth_read_raw_IF4
p5
;
}
else
if
(
eth
->
flags
==
ETH_RAW_IF5_MOBIPASS
)
{
device
->
trx_write_func
=
trx_eth_write_raw_IF4
;
device
->
trx_read_func
=
trx_eth_read_raw_IF4
;
device
->
trx_write_func
=
trx_eth_write_raw_IF4
p5
;
device
->
trx_read_func
=
trx_eth_read_raw_IF4
p5
;
}
else
{
//device->trx_write_func = trx_eth_write_udp_IF4;
//device->trx_read_func = trx_eth_read_udp_IF4;
//device->trx_write_func = trx_eth_write_udp_IF4
p5
;
//device->trx_read_func = trx_eth_read_udp_IF4
p5
;
}
eth
->
if_name
[
device
->
Mod_id
]
=
eth_params
->
local_if_name
;
...
...
This diff is collapsed.
Click to expand it.
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
View file @
025f56d2
...
...
@@ -222,11 +222,11 @@ int eth_set_dev_conf_udp(openair0_device *device);
int
eth_socket_init_raw
(
openair0_device
*
device
);
int
trx_eth_write_raw
(
openair0_device
*
device
,
openair0_timestamp
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
,
int
flags
);
int
trx_eth_read_raw
(
openair0_device
*
device
,
openair0_timestamp
*
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
);
int
trx_eth_write_raw_IF4
(
openair0_device
*
device
,
openair0_timestamp
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
,
int
flags
);
int
trx_eth_read_raw_IF4
(
openair0_device
*
device
,
openair0_timestamp
*
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
);
int
trx_eth_write_raw_IF4
p5
(
openair0_device
*
device
,
openair0_timestamp
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
,
int
flags
);
int
trx_eth_read_raw_IF4
p5
(
openair0_device
*
device
,
openair0_timestamp
*
timestamp
,
void
**
buff
,
int
nsamps
,
int
cc
);
int
eth_get_dev_conf_raw
(
openair0_device
*
device
);
int
eth_set_dev_conf_raw
(
openair0_device
*
device
);
int
eth_get_dev_conf_raw_IF4
(
openair0_device
*
device
);
int
eth_set_dev_conf_raw_IF4
(
openair0_device
*
device
);
int
eth_get_dev_conf_raw_IF4
p5
(
openair0_device
*
device
);
int
eth_set_dev_conf_raw_IF4
p5
(
openair0_device
*
device
);
#endif
This diff is collapsed.
Click to expand it.
targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
View file @
025f56d2
...
...
@@ -47,8 +47,8 @@
// ETH transport preference modes
#define ETH_UDP_MODE 0
#define ETH_RAW_MODE 1
#define ETH_UDP_IF4_MODE 2
#define ETH_RAW_IF4_MODE 3
#define ETH_UDP_IF4
p5
_MODE 2
#define ETH_RAW_IF4
p5
_MODE 3
#define ETH_RAW_IF5_MOBIPASS 4
// Time domain RRH packet sizes
...
...
@@ -58,13 +58,13 @@
#define UDP_PACKET_SIZE_BYTES(nsamps) (APP_HEADER_SIZE_BYTES + PAYLOAD_SIZE_BYTES(nsamps))
#define RAW_PACKET_SIZE_BYTES(nsamps) (APP_HEADER_SIZE_BYTES + MAC_HEADER_SIZE_BYTES + PAYLOAD_SIZE_BYTES(nsamps))
// Packet sizes for IF4 interface format
// Packet sizes for IF4
p5
interface format
#define DATA_BLOCK_SIZE_BYTES(scaled_nblocks) (sizeof(uint16_t)*scaled_nblocks)
#define PRACH_BLOCK_SIZE_BYTES (sizeof(int16_t)*839*2) // FIX hard coded prach size (uncompressed)
#define RAW_IF4
_PDLFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4
_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
#define RAW_IF4
_PULFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4
_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
#define RAW_IF4
_PRACH_SIZE_BYTES (MAC_HEADER_SIZE_BYTES + sizeof_IF4
_header_t + PRACH_BLOCK_SIZE_BYTES)
#define RAW_IF4
p5_PDLFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4p5
_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
#define RAW_IF4
p5_PULFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4p5
_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
#define RAW_IF4
p5_PRACH_SIZE_BYTES (MAC_HEADER_SIZE_BYTES + sizeof_IF4p5
_header_t + PRACH_BLOCK_SIZE_BYTES)
// Mobipass packet sizes
#define RAW_IF5_MOBIPASS_BLOCK_SIZE_BYTES 1280
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-enb.c
View file @
025f56d2
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.c
View file @
025f56d2
...
...
@@ -1056,9 +1056,9 @@ static void get_options (int argc, char **argv)
if
(
enb_properties
->
properties
[
i
]
->
rrh_gw_config
[
j
].
raw
==
1
)
{
(
eth_params
+
j
)
->
transp_preference
=
ETH_RAW_MODE
;
}
else
if
(
enb_properties
->
properties
[
i
]
->
rrh_gw_config
[
j
].
rawif4
==
1
)
{
(
eth_params
+
j
)
->
transp_preference
=
ETH_RAW_IF4_MODE
;
(
eth_params
+
j
)
->
transp_preference
=
ETH_RAW_IF4
p5
_MODE
;
}
else
if
(
enb_properties
->
properties
[
i
]
->
rrh_gw_config
[
j
].
udpif4
==
1
)
{
(
eth_params
+
j
)
->
transp_preference
=
ETH_UDP_IF4_MODE
;
(
eth_params
+
j
)
->
transp_preference
=
ETH_UDP_IF4
p5
_MODE
;
}
else
if
(
enb_properties
->
properties
[
i
]
->
rrh_gw_config
[
j
].
rawif5_mobipass
==
1
)
{
(
eth_params
+
j
)
->
transp_preference
=
ETH_RAW_IF5_MOBIPASS
;
}
else
{
...
...
@@ -1645,7 +1645,7 @@ int main( int argc, char **argv )
if
(
UE_flag
==
0
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
if
(
node_function
[
CC_id
]
==
NGFI_RRU_IF4
||
node_function
[
CC_id
]
==
NGFI_RRU_IF5
)
{
if
(
node_function
[
CC_id
]
==
NGFI_RRU_IF4
p5
||
node_function
[
CC_id
]
==
NGFI_RRU_IF5
)
{
PHY_vars_eNB_g
[
0
][
CC_id
]
->
rfdevice
.
host_type
=
RRH_HOST
;
PHY_vars_eNB_g
[
0
][
CC_id
]
->
ifdevice
.
host_type
=
RRH_HOST
;
}
else
{
...
...
@@ -1667,7 +1667,7 @@ int main( int argc, char **argv )
// Load RF device and initialize
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
if
(
node_function
[
CC_id
]
==
NGFI_RRU_IF5
||
node_function
[
CC_id
]
==
NGFI_RRU_IF4
||
node_function
[
CC_id
]
==
eNodeB_3GPP
)
{
if
(
node_function
[
CC_id
]
==
NGFI_RRU_IF5
||
node_function
[
CC_id
]
==
NGFI_RRU_IF4
p5
||
node_function
[
CC_id
]
==
eNodeB_3GPP
)
{
if
(
mode
!=
loop_through_memory
)
{
returns
=
(
UE_flag
==
0
)
?
openair0_device_load
(
&
(
PHY_vars_eNB_g
[
0
][
CC_id
]
->
rfdevice
),
&
openair0_cfg
[
0
])
:
...
...
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