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
wangwenhui
OpenXG-RAN
Commits
c7aa94c3
Commit
c7aa94c3
authored
6 years ago
by
Bi-Ruei, Chiu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade ASN.1 of NR-RRC to 15.3.0
parent
99e8dea6
develop
1
128-ues
256_QAM_demod
375-syrtem-sdr-platform
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_TRX_on_single_port
NCTU_CS_ISIP
NCTU_CS_ISIP_CPU
NCTU_CS_ISIP_GPU
NCTU_OpinConnect_LDPC
NR-PHY-MAC-IF-multi-UE
NR_10MHz
NR_CSI_reporting
NR_DCI_01
NR_DLUL_PF
NR_DLUL_PF_rebased
NR_DL_sched_fixes
NR_DL_scheduler
NR_FAPI_beamindex_SSB_RO
NR_FR2_RA
NR_FR2_RRC_SSB
NR_MAC_CE_GlobalEdge
NR_MAC_Multi_Rach_GlobalEdge
NR_MAC_SSB_RO_GlobalEdge
NR_MAC_SSB_RO_UE_IDCC
NR_MAC_SSB_RO_merge
NR_MAC_TCI_UCI_GlobalEdge
NR_NGAP
NR_PDCP_noS1
NR_PUCCH_MultiUE
NR_RA_updates
NR_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_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_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_test_S1U_RRC_PRACH_procedures
NR_ue_dlsch_dmrs_cdm
OpInConnect_ISIP
PUSCH_TA_update
RA_CI_test
UE_DL_DCI_hotfix
addoptions_nr_USRPdevice
bch-fixes-bitmap
benetel_5g_prach_fix
benetel_driver_update
benetel_phase_rotation
benetel_phase_rotation_old
bugfix-minor-remove-wrong-log
bugfix-nr-bands
bugfix-nr-ldpc-post-processing
bugfix-nr-ldpc-size-typo
bugfix-nr-pdcp-sn-size
bugfix-nr-rate-matching-assertion
cce_indexing_fix
cce_indexing_fix2
ci-deploy-asterix
ci-deploy-docker-compose
ci-rd-july-improvements
ci-test
ci-ul-iperf-from-trf-container
clean-5G-scope-round2
cleanup_softmodem_main
constant_power
debug_branch_init_sync
develop-SnT
develop-ci
develop-nr
develop-nr-fr2
develop-nr-fr2-rework
develop-nr_cppcheck
develop-oriecpriupdates
develop-sib1
develop-sib1-local
develop-sib1-lts
develop_inria_ci_deployment
develop_inria_ci_deployment_gp
develop_integration_2020_w15
develop_integration_2020_w19
develop_integration_w08
develop_stable
dfts_alternatives
dlsch-all-dlslots
dlsch_encode_mthread
dlsch_parallel
docupdate_tools
dongzhanyi-zte-develop
dongzhanyi-zte-develop2
dreibh/apt-auth-fix
dreibh/device-load-fix
dreibh/device-load-fix-develop-branch
dual-connectivity
edrx
extend_sharedlibusage
extend_sharedlibusage2
fapi_for_dmrs_and_ptrs
feat-mac-sock
feature-4g-sched
feature-nr-4g-nfapi-modifications
feature-support-clang-format
feature/make-s1-mme-port-configurable
feature/make-s1-mme-port-configurable-with-astyle-fixes
fembms-enb-ue
finalize-oaicn-integration
firas
fix-ci-tun
fix-clock-source
fix-itti-segv
fix-l2-sim
fix-limeSDR-compile
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
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
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
inter-RRU-final
inter-RRU-nr
inter-RRU-oairu
inter-rru-UE
interoperability-test
isip_nr
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_uplink_improvement
mac-fixes-wk45_2
mbms-fix-develop-nr
merging-2019-w51-to-develop-nr
minor-fix-doc-basic-sim
mosaic5g-oai-ran
mosaic5g-oai-sim
nasmesh_kernel_5.8
new_rlc_2020
nfapi-bugfix
nfapi_nr_develop
ngap-dlul
ngap-support
ngap-w48-merge2
ngap-wf
ngap-wf-1120
ngap-wf-1120-srb
ngap-wf-1120-srb-gtp
ngap-wf-1120-srb-gtp-hs
ngap-wf-1120-srb-gtp-hs1
ngap-wf-1120-srb-gtp-hs2
ngap-wf-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
oc-docker-october-improvements
openxg/develop
pdcp-benchmark
pdsch-ch-est
polar8
ptrs_rrc_config
pusch-mthread-scaling-fix
pusch-retrans-fix-ue
ra-dl-ul
reduce_memory_footprint
remove-ci-workaround
remove_nos1_hack_pdcp
remove_x2_gnb_hardcoding
repair-TA
revert-f5c94279
revert_memcpy
rh-ci-add-ue-parallelization
rh_ci_fix_autoterminate
rh_ci_fr1_update
rh_ci_oc
rh_ci_py
rh_ci_rfsim_ra
rh_doc_update_3
rh_fr1_newjenkins
rh_fr1_update
rh_gnb_compile_fix
rh_wk50_debug
rlc-v2-bugfix-status-reporting
rlc-v2-tick
rlc_v2_coverity_fixes
rrc-enb-phy-testmode
ru-parallel-beamforming
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
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-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-log-scheduling-requests
x2-endc-processing
xiangwab
xiangwan
yihongzheng_srb
zzs
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
osa-etsi-ws-ue
osa-etsi-ws-try2
osa-etsi-ws-try1
osa-etsi-ws-gNB
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
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6658 additions
and
11 deletions
+6658
-11
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-2
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+61
-0
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+9
-0
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+4
-0
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+55
-9
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.3.0.asn1
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.3.0.asn1
+6516
-0
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+11
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
c7aa94c3
...
...
@@ -355,8 +355,8 @@ add_custom_command (
add_list2_option
(
NR_RRC_ASN1_VERSION
"NR_Rel15"
"ASN.1 version of NR_RRC interface"
)
if
(
${
NR_RRC_ASN1_VERSION
}
STREQUAL
"NR_Rel15"
)
make_version
(
NR_RRC_VERSION 15
2 1
)
set
(
NR_RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.
2.1
.asn1
)
make_version
(
NR_RRC_VERSION 15
3 0
)
set
(
NR_RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.
3.0
.asn1
)
endif
(
${
NR_RRC_ASN1_VERSION
}
STREQUAL
"NR_Rel15"
)
add_definitions
(
-DNR_RRC_VERSION=
${
NR_RRC_VERSION
}
)
set
(
NR_RRC_FULL_DIR
${
asn1_generated_dir
}
/
${
NR_RRC_ASN1_VERSION
}
)
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
View file @
c7aa94c3
...
...
@@ -1980,9 +1980,17 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
}
if
(
strcmp
(
RateMatchPattern_mode
,
"dynamic"
)
==
0
){
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPattern_mode
[
j
]
=
NR_RateMatchPattern__dummy_dynamic
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPattern_mode
[
j
]
=
NR_RateMatchPattern__mode_dynamic
;
#endif
}
else
if
(
strcmp
(
RateMatchPattern_mode
,
"semiStatic"
)
==
0
){
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPattern_mode
[
j
]
=
NR_RateMatchPattern__dummy_semiStatic
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPattern_mode
[
j
]
=
NR_RateMatchPattern__mode_semiStatic
;
#endif
}
else
{
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%s
\"
for RateMatchPattern_mode !
\n
"
,
RC
.
config_file_name
,
i
,
RateMatchPattern_mode
);
...
...
@@ -2440,41 +2448,86 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
switch
(
Common_dci_Format2_3_monitoringPeriodicity
){
case
1
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl1
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n1
;
#endif
break
;
case
2
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl2
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n2
;
#endif
break
;
case
4
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl4
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n4
;
#endif
break
;
case
5
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl5
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n5
;
#endif
break
;
case
8
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl8
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n8
;
#endif
break
;
case
10
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl10
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n10
;
#endif
break
;
case
16
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl16
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n16
;
#endif
break
;
case
20
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy1_sl20
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_monitoringPeriodicity
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__monitoringPeriodicity_n20
;
#endif
break
;
default:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%d
\"
for Common_dci_Format2_3_dummy1 choice: 1,2,4,5,8,10,16,20 !
\n
"
,
RC
.
config_file_name
,
i
,
Common_dci_Format2_3_monitoringPeriodicity
);
#else
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%d
\"
for Common_dci_Format2_3_monitoringPeriodicity choice: 1,2,4,5,8,10,16,20 !
\n
"
,
RC
.
config_file_name
,
i
,
Common_dci_Format2_3_monitoringPeriodicity
);
#endif
break
;
}
switch
(
Common_dci_Format2_3_nrofPDCCH_Candidates
){
case
1
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_nrofPDCCH_Candidates
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy2_n1
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_nrofPDCCH_Candidates
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__nrofPDCCH_Candidates_n1
;
#endif
break
;
case
2
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_nrofPDCCH_Candidates
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__dummy2_n2
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
Common_dci_Format2_3_nrofPDCCH_Candidates
[
j
]
=
NR_SearchSpace__searchSpaceType__common__dci_Format2_3__nrofPDCCH_Candidates_n2
;
#endif
break
;
default:
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%d
\"
for Common_dci_Format2_3_nrofPDCCH_Candidates choice: 1,2 !
\n
"
,
...
...
@@ -2598,9 +2651,17 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
}
if
(
strcmp
(
RateMatchPatternLTE_CRS_subframeAllocation_choice
,
"oneFrame"
)
==
0
){
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPatternLTE_CRS_subframeAllocation_choice
[
j
]
=
NR_EUTRA_MBSFN_SubframeConfig__subframeAllocation1_PR_oneFrame
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPatternLTE_CRS_subframeAllocation_choice
[
j
]
=
NR_EUTRA_MBSFN_SubframeConfig__subframeAllocation_PR_oneFrame
;
#endif
}
else
if
(
strcmp
(
RateMatchPatternLTE_CRS_subframeAllocation_choice
,
"fourFrames"
)
==
0
){
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPatternLTE_CRS_subframeAllocation_choice
[
j
]
=
NR_EUTRA_MBSFN_SubframeConfig__subframeAllocation1_PR_fourFrames
;
#else
NRRRC_CONFIGURATION_REQ
(
msg_p
).
RateMatchPatternLTE_CRS_subframeAllocation_choice
[
j
]
=
NR_EUTRA_MBSFN_SubframeConfig__subframeAllocation_PR_fourFrames
;
#endif
}
else
{
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%s
\"
for RateMatchPatternLTE_CRS_subframeAllocation_choice !
\n
"
,
RC
.
config_file_name
,
i
,
RateMatchPatternLTE_CRS_subframeAllocation_choice
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
c7aa94c3
...
...
@@ -114,8 +114,13 @@ int8_t nr_ue_decode_mib(
uint32_t
is_condition_A
=
(
ssb_subcarrier_offset
==
0
);
// 38.213 ch.13
frequency_range_t
frequency_range
=
FR1
;
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
uint32_t
index_4msb
=
(
mac
->
mib
->
pdcch_ConfigSIB1
.
controlResourceSetZero
);
uint32_t
index_4lsb
=
(
mac
->
mib
->
pdcch_ConfigSIB1
.
searchSpaceZero
);
#else
uint32_t
index_4msb
=
(
mac
->
mib
->
pdcch_ConfigSIB1
>>
4
)
&
0xf
;
uint32_t
index_4lsb
=
(
mac
->
mib
->
pdcch_ConfigSIB1
&
0xf
);
#endif
int32_t
num_rbs
=
-
1
;
int32_t
num_symbols
=
-
1
;
int32_t
rb_offset
=
-
1
;
...
...
@@ -428,7 +433,11 @@ int8_t nr_ue_decode_mib(
mac
->
phy_config
.
config_req
.
pbch_config
.
subcarrier_spacing_common
=
mac
->
mib
->
subCarrierSpacingCommon
;
mac
->
phy_config
.
config_req
.
pbch_config
.
ssb_subcarrier_offset
=
ssb_subcarrier_offset
;
// after calculation
mac
->
phy_config
.
config_req
.
pbch_config
.
dmrs_type_a_position
=
mac
->
mib
->
dmrs_TypeA_Position
;
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
mac
->
phy_config
.
config_req
.
pbch_config
.
pdcch_config_sib1
=
(
mac
->
mib
->
pdcch_ConfigSIB1
.
controlResourceSetZero
)
*
16
+
(
mac
->
mib
->
pdcch_ConfigSIB1
.
searchSpaceZero
);
#else
mac
->
phy_config
.
config_req
.
pbch_config
.
pdcch_config_sib1
=
mac
->
mib
->
pdcch_ConfigSIB1
;
#endif
mac
->
phy_config
.
config_req
.
pbch_config
.
cell_barred
=
mac
->
mib
->
cellBarred
;
mac
->
phy_config
.
config_req
.
pbch_config
.
intra_frequency_reselection
=
mac
->
mib
->
intraFreqReselection
;
mac
->
phy_config
.
config_req
.
pbch_config
.
half_frame_bit
=
half_frame_bit
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
c7aa94c3
...
...
@@ -232,7 +232,11 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
mib
->
message
.
choice
.
mib
->
subCarrierSpacingCommon
,
mib
->
message
.
choice
.
mib
->
ssb_SubcarrierOffset
,
mib
->
message
.
choice
.
mib
->
dmrs_TypeA_Position
,
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
mib
->
message
.
choice
.
mib
->
pdcch_ConfigSIB1
.
controlResourceSetZero
*
16
+
mib
->
message
.
choice
.
mib
->
pdcch_ConfigSIB1
.
searchSpaceZero
,
#else
mib
->
message
.
choice
.
mib
->
pdcch_ConfigSIB1
,
#endif
mib
->
message
.
choice
.
mib
->
cellBarred
,
mib
->
message
.
choice
.
mib
->
intraFreqReselection
);
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
c7aa94c3
...
...
@@ -234,15 +234,19 @@ uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier,
mib
->
message
.
choice
.
mib
->
systemFrameNumber
.
bits_unused
=
2
;
//38.331 spare BIT STRING (SIZE (1))
uint16_t
*
spare
=
calloc
(
1
,
sizeof
(
uint16_t
));
uint16_t
*
spare
=
CALLOC
(
1
,
sizeof
(
uint16_t
));
if
(
spare
==
NULL
)
abort
();
mib
->
message
.
choice
.
mib
->
spare
.
buf
=
(
uint8_t
*
)
spare
;
mib
->
message
.
choice
.
mib
->
spare
.
size
=
1
;
mib
->
message
.
choice
.
mib
->
spare
.
bits_unused
=
7
;
// This makes a spare of 1 bits
mib
->
message
.
choice
.
mib
->
ssb_SubcarrierOffset
=
ssb_SubcarrierOffset
;
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
mib
->
message
.
choice
.
mib
->
pdcch_ConfigSIB1
.
controlResourceSetZero
=
(
pdcch_ConfigSIB1
/
16
);
mib
->
message
.
choice
.
mib
->
pdcch_ConfigSIB1
.
searchSpaceZero
=
(
pdcch_ConfigSIB1
%
16
);
#else
mib
->
message
.
choice
.
mib
->
pdcch_ConfigSIB1
=
pdcch_ConfigSIB1
;
#endif
switch
(
subCarrierSpacingCommon
)
{
case
15
:
mib
->
message
.
choice
.
mib
->
subCarrierSpacingCommon
=
NR_MIB__subCarrierSpacingCommon_scs15or60
;
...
...
@@ -353,7 +357,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
controlResourceSetZero
=
CALLOC
(
1
,
sizeof
(
long
));
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceZero
=
CALLOC
(
1
,
sizeof
(
long
));
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonControlResourceSet
=
CALLOC
(
1
,
sizeof
(
struct
NR_ControlResourceSet
));
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
=
CALLOC
(
1
,
sizeof
(
struct
NR_PDCCH_ConfigCommon__commonSearchSpaceList
));
#else
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpace
=
CALLOC
(
1
,
sizeof
(
struct
NR_PDCCH_ConfigCommon__commonSearchSpace
));
#endif
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceSIB1
=
CALLOC
(
1
,
sizeof
(
NR_SearchSpaceId_t
));
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceOtherSystemInformation
=
CALLOC
(
1
,
sizeof
(
NR_SearchSpaceId_t
));
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
pagingSearchSpace
=
CALLOC
(
1
,
sizeof
(
NR_SearchSpaceId_t
));
...
...
@@ -377,8 +385,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rsrp_ThresholdSSB
=
CALLOC
(
1
,
sizeof
(
NR_RSRP_Range_t
));
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
rsrp_ThresholdSSB_SUL
=
CALLOC
(
1
,
sizeof
(
NR_RSRP_Range_t
));
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg1_SubcarrierSpacing
=
CALLOC
(
1
,
sizeof
(
NR_SubcarrierSpacing_t
));
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
=
CALLOC
(
1
,
sizeof
(
long
));
#else
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoding
=
CALLOC
(
1
,
sizeof
(
long
));
#endif
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
=
CALLOC
(
1
,
sizeof
(
NR_SetupRelease_PUSCH_ConfigCommon_t
));
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
=
CALLOC
(
1
,
sizeof
(
struct
NR_PUSCH_ConfigCommon
));
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
pusch_ConfigCommon
->
choice
.
setup
->
groupHoppingEnabledTransformPrecoding
=
CALLOC
(
1
,
sizeof
(
long
));
...
...
@@ -574,20 +585,32 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_0
->
nrofCandidates_SFI
.
aggregationLevel8
=
CALLOC
(
1
,
sizeof
(
long
));
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_0
->
nrofCandidates_SFI
.
aggregationLevel16
=
CALLOC
(
1
,
sizeof
(
long
));
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_3
=
CALLOC
(
1
,
sizeof
(
struct
NR_SearchSpace__searchSpaceType__common__dci_Format2_3
));
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_3
->
dummy1
=
CALLOC
(
1
,
sizeof
(
long
));
#else
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_3
->
monitoringPeriodicity
=
CALLOC
(
1
,
sizeof
(
long
));
#endif
*
(
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_0
->
nrofCandidates_SFI
.
aggregationLevel1
)
=
configuration
->
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel1
[
CC_id
];
*
(
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_0
->
nrofCandidates_SFI
.
aggregationLevel2
)
=
configuration
->
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel2
[
CC_id
];
*
(
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_0
->
nrofCandidates_SFI
.
aggregationLevel4
)
=
configuration
->
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel4
[
CC_id
];
*
(
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_0
->
nrofCandidates_SFI
.
aggregationLevel8
)
=
configuration
->
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel8
[
CC_id
];
*
(
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_0
->
nrofCandidates_SFI
.
aggregationLevel16
)
=
configuration
->
Common_dci_Format2_0_nrofCandidates_SFI_aggregationLevel16
[
CC_id
];
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
*
(
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_3
->
dummy1
)
=
configuration
->
Common_dci_Format2_3_monitoringPeriodicity
[
CC_id
];
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_3
->
dummy2
=
configuration
->
Common_dci_Format2_3_nrofPDCCH_Candidates
[
CC_id
];
#else
*
(
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_3
->
monitoringPeriodicity
)
=
configuration
->
Common_dci_Format2_3_monitoringPeriodicity
[
CC_id
];
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
common
->
dci_Format2_3
->
nrofPDCCH_Candidates
=
configuration
->
Common_dci_Format2_3_nrofPDCCH_Candidates
[
CC_id
];
#endif
}
else
if
(
bwp_dl_searchspace
->
searchSpaceType
->
present
==
NR_SearchSpace__searchSpaceType_PR_ue_Specific
){
bwp_dl_searchspace
->
searchSpaceType
->
choice
.
ue_Specific
->
dci_Formats
=
configuration
->
ue_Specific__dci_Formats
[
CC_id
];
}
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
ASN_SEQUENCE_ADD
(
&
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpaceList
->
list
,
&
bwp_dl_searchspace
);
#else
ASN_SEQUENCE_ADD
(
&
(
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
commonSearchSpace
->
list
,
&
bwp_dl_searchspace
);
#endif
*
((
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceSIB1
)
=
configuration
->
searchSpaceSIB1
[
CC_id
];
*
((
*
servingcellconfigcommon
)
->
downlinkConfigCommon
->
initialDownlinkBWP
->
pdcch_ConfigCommon
->
choice
.
setup
->
searchSpaceOtherSystemInformation
)
=
configuration
->
searchSpaceOtherSystemInformation
[
CC_id
];
...
...
@@ -675,7 +698,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
restrictedSetConfig
=
configuration
->
restrictedSetConfig
[
CC_id
];
if
(
configuration
->
msg3_transformPrecoding
[
CC_id
]){
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
*
((
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoder
)
=
NR_RACH_ConfigCommon__msg3_transformPrecoder_enabled
;
#else
*
((
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
msg3_transformPrecoding
)
=
NR_RACH_ConfigCommon__msg3_transformPrecoding_enabled
;
#endif
}
//Fill initialUplinkBWP -> BWP-UplinkCommon -> rach_ConfigCommon -> rach_ConfigGeneric//
...
...
@@ -710,8 +737,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
*
((
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
->
p0_nominal
)
=
configuration
->
p0_nominal
[
CC_id
];
*
((
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
->
pucch_ResourceCommon
)
=
configuration
->
pucch_ResourceCommon
[
CC_id
];
*
((
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
->
hoppingId
)
=
configuration
->
hoppingId
[
CC_id
];
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
dummy
=
configuration
->
UL_timeAlignmentTimerCommon
[
CC_id
];
#else
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
timeAlignmentTimerCommon
=
configuration
->
UL_timeAlignmentTimerCommon
[
CC_id
];
#endif
(
*
servingcellconfigcommon
)
->
n_TimingAdvanceOffset
=
CALLOC
(
1
,
sizeof
(
long
));
*
((
*
servingcellconfigcommon
)
->
n_TimingAdvanceOffset
)
=
configuration
->
ServingCellConfigCommon_n_TimingAdvanceOffset
[
CC_id
];
...
...
@@ -820,7 +850,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
}
*
(
ratematchpattern
->
subcarrierSpacing
)
=
configuration
->
RateMatchPattern_subcarrierSpacing
[
CC_id
];
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
ratematchpattern
->
dummy
=
configuration
->
RateMatchPattern_mode
[
CC_id
];
#else
ratematchpattern
->
mode
=
configuration
->
RateMatchPattern_mode
[
CC_id
];
#endif
ASN_SEQUENCE_ADD
(
&
(
*
servingcellconfigcommon
)
->
rateMatchPatternToAddModList
->
list
,
&
ratematchpattern
);
...
...
@@ -1049,7 +1083,11 @@ void do_MAC_CELLGROUP(uint8_t Mod_id,
mac_CellGroupConfig
->
phr_Config
->
choice
.
setup
->
phr_ProhibitTimer
=
mac_cellgroup_config
->
phr_ProhibitTimer
[
CC_id
];
mac_CellGroupConfig
->
phr_Config
->
choice
.
setup
->
phr_Tx_PowerFactorChange
=
mac_cellgroup_config
->
phr_Tx_PowerFactorChange
[
CC_id
];
mac_CellGroupConfig
->
phr_Config
->
choice
.
setup
->
multiplePHR
=
mac_cellgroup_config
->
multiplePHR
[
CC_id
];
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
mac_CellGroupConfig
->
phr_Config
->
choice
.
setup
->
dummy
=
mac_cellgroup_config
->
phr_Type2SpCell
[
CC_id
];
#else
mac_CellGroupConfig
->
phr_Config
->
choice
.
setup
->
phr_Type2SpCell
=
mac_cellgroup_config
->
phr_Type2SpCell
[
CC_id
];
#endif
mac_CellGroupConfig
->
phr_Config
->
choice
.
setup
->
phr_Type2OtherCell
=
mac_cellgroup_config
->
phr_Type2OtherCell
[
CC_id
];
mac_CellGroupConfig
->
phr_Config
->
choice
.
setup
->
phr_ModeOtherCG
=
mac_cellgroup_config
->
phr_ModeOtherCG
[
CC_id
];
...
...
@@ -1064,7 +1102,11 @@ void do_PHYSICALCELLGROUP(uint8_t Mod_id,
physicalCellGroupConfig
->
harq_ACK_SpatialBundlingPUCCH
=
CALLOC
(
1
,
sizeof
(
long
));
physicalCellGroupConfig
->
harq_ACK_SpatialBundlingPUSCH
=
CALLOC
(
1
,
sizeof
(
long
));
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
physicalCellGroupConfig
->
p_NR_FR1
=
CALLOC
(
1
,
sizeof
(
NR_P_Max_t
));
#else
physicalCellGroupConfig
->
p_NR
=
CALLOC
(
1
,
sizeof
(
NR_P_Max_t
));
#endif
physicalCellGroupConfig
->
tpc_SRS_RNTI
=
CALLOC
(
1
,
sizeof
(
NR_RNTI_Value_t
));
physicalCellGroupConfig
->
tpc_PUCCH_RNTI
=
CALLOC
(
1
,
sizeof
(
NR_RNTI_Value_t
));
physicalCellGroupConfig
->
tpc_PUSCH_RNTI
=
CALLOC
(
1
,
sizeof
(
NR_RNTI_Value_t
));
...
...
@@ -1072,7 +1114,11 @@ void do_PHYSICALCELLGROUP(uint8_t Mod_id,
*
(
physicalCellGroupConfig
->
harq_ACK_SpatialBundlingPUCCH
)
=
physicalcellgroup_config
->
harq_ACK_SpatialBundlingPUCCH
[
CC_id
];
*
(
physicalCellGroupConfig
->
harq_ACK_SpatialBundlingPUSCH
)
=
physicalcellgroup_config
->
harq_ACK_SpatialBundlingPUSCH
[
CC_id
];
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
*
(
physicalCellGroupConfig
->
p_NR_FR1
)
=
physicalcellgroup_config
->
p_NR
[
CC_id
];
#else
*
(
physicalCellGroupConfig
->
p_NR
)
=
physicalcellgroup_config
->
p_NR
[
CC_id
];
#endif
physicalCellGroupConfig
->
pdsch_HARQ_ACK_Codebook
=
physicalcellgroup_config
->
pdsch_HARQ_ACK_Codebook
[
CC_id
];
*
(
physicalCellGroupConfig
->
tpc_SRS_RNTI
)
=
physicalcellgroup_config
->
tpc_SRS_RNTI
[
CC_id
];
*
(
physicalCellGroupConfig
->
tpc_PUCCH_RNTI
)
=
physicalcellgroup_config
->
tpc_PUCCH_RNTI
[
CC_id
];
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-15.3.0.asn1
0 → 100644
View file @
c7aa94c3
This source diff could not be displayed because it is too large. You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
openair2/RRC/NR_UE/rrc_UE.c
View file @
c7aa94c3
...
...
@@ -385,6 +385,16 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
break
;
case
NR_DL_DCCH_MessageType__c1_PR_NOTHING
:
#if (NR_RRC_VERSION >= MAKE_VERSION(15, 3, 0))
case
NR_DL_DCCH_MessageType__c1_PR_rrcResume
:
case
NR_DL_DCCH_MessageType__c1_PR_rrcRelease
:
case
NR_DL_DCCH_MessageType__c1_PR_rrcReestablishment
:
case
NR_DL_DCCH_MessageType__c1_PR_securityModeCommand
:
case
NR_DL_DCCH_MessageType__c1_PR_dlInformationTransfer
:
case
NR_DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry
:
case
NR_DL_DCCH_MessageType__c1_PR_counterCheck
:
case
NR_DL_DCCH_MessageType__c1_PR_mobilityFromNRCommand
:
#else
case
NR_DL_DCCH_MessageType__c1_PR_spare15
:
case
NR_DL_DCCH_MessageType__c1_PR_spare14
:
case
NR_DL_DCCH_MessageType__c1_PR_spare13
:
...
...
@@ -393,6 +403,7 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
case
NR_DL_DCCH_MessageType__c1_PR_spare10
:
case
NR_DL_DCCH_MessageType__c1_PR_spare9
:
case
NR_DL_DCCH_MessageType__c1_PR_spare8
:
#endif
case
NR_DL_DCCH_MessageType__c1_PR_spare7
:
case
NR_DL_DCCH_MessageType__c1_PR_spare6
:
case
NR_DL_DCCH_MessageType__c1_PR_spare5
:
...
...
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