Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
4a8823d4
Commit
4a8823d4
authored
Aug 13, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/nr_rrc_asn1_16_4_1' into integration_2021_w33
parents
05dd7b2f
96af5382
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14345 additions
and
27 deletions
+14345
-27
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+2
-2
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+1
-1
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/extract_asn1_from_spce.pl
...RC/NR/MESSAGES/asn1c/ASN1_files/extract_asn1_from_spce.pl
+37
-23
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-16.4.1.asn1
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-16.4.1.asn1
+14304
-0
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
4a8823d4
...
...
@@ -457,8 +457,8 @@ include_directories ("${RRC_FULL_DIR}")
#NR RRC
#######
set
(
NR_RRC_ASN1_VERSION
"NR_Rel16"
)
make_version
(
NR_RRC_VERSION 16
1 0
)
set
(
NR_RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-16.
1.0
.asn1
)
make_version
(
NR_RRC_VERSION 16
4 1
)
set
(
NR_RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-16.
4.1
.asn1
)
add_definitions
(
-DNR_RRC_VERSION=
${
NR_RRC_VERSION
}
)
set
(
NR_RRC_FULL_DIR
${
asn1_generated_dir
}
/RRC_
${
NR_RRC_ASN1_VERSION
}
)
...
...
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
4a8823d4
...
...
@@ -157,7 +157,7 @@ void init_RA(module_id_t mod_id,
}
if
(
nr_rach_ConfigCommon
->
ext1
)
{
if
(
nr_rach_ConfigCommon
->
ext1
->
ra_PrioritizationForAccessIdentity
){
if
(
nr_rach_ConfigCommon
->
ext1
->
ra_PrioritizationForAccessIdentity
_r16
){
LOG_D
(
MAC
,
"In %s:%d: Missing implementation for Access Identity initialization procedures
\n
"
,
__FUNCTION__
,
__LINE__
);
}
}
...
...
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/extract_asn1_from_spce.pl
View file @
4a8823d4
...
...
@@ -26,38 +26,52 @@ while (<INPUT_FILE>) {
syswrite
OUTPUT_FILE
,"
END
\n\n
";
while
(
<
INPUT_FILE
>
)
{
if
(
m/NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=/
){
syswrite
OUTPUT_FILE
,"
$_
\n
";
syswrite
OUTPUT_FILE
,"
BEGIN
\n\n
";
while
(
<
INPUT_FILE
>
)
{
if
(
m/PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=/
){
syswrite
OUTPUT_FILE
,"
$_
\n
";
syswrite
OUTPUT_FILE
,"
BEGIN
\n\n
";
# Get all the text delimited by -- ASN1START and -- ASN1STOP
extract_asn1
();
# Get all the text delimited by -- ASN1START and -- ASN1STOP
extract_asn1
();
syswrite
OUTPUT_FILE
,"
END
\n\n
";
syswrite
OUTPUT_FILE
,"
END
\n\n
";
while
(
<
INPUT_FILE
>
)
{
while
(
<
INPUT_FILE
>
)
{
if
(
m/NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=/
){
syswrite
OUTPUT_FILE
,"
$_
\n
";
syswrite
OUTPUT_FILE
,"
BEGIN
\n\n
";
# Get all the text delimited by -- ASN1START and -- ASN1STOP
extract_asn1
();
syswrite
OUTPUT_FILE
,"
END
\n\n
";
while
(
<
INPUT_FILE
>
)
{
if
(
m/NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=/
){
syswrite
OUTPUT_FILE
,"
$_
\n
";
syswrite
OUTPUT_FILE
,"
BEGIN
\n\n
";
# Get all the text delimited by -- ASN1START and -- ASN1STOP
extract_asn1
();
syswrite
OUTPUT_FILE
,"
END
\n\n
";
while
(
<
INPUT_FILE
>
)
{
if
(
m/NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=/
){
syswrite
OUTPUT_FILE
,"
$_
\n
";
syswrite
OUTPUT_FILE
,"
BEGIN
\n\n
";
syswrite
OUTPUT_FILE
,"
$_
\n
";
syswrite
OUTPUT_FILE
,"
BEGIN
\n\n
";
# Get all the text delimited by -- ASN1START and -- ASN1STOP
extract_asn1
();
# Get all the text delimited by -- ASN1START and -- ASN1STOP
extract_asn1
();
syswrite
OUTPUT_FILE
,"
END
\n\n
";
}
syswrite
OUTPUT_FILE
,"
END
\n\n
";
}
}
}
}
}
}
}
}
}
}
close
(
OUTPUT_FILE
);
}
}
close
(
INPUT_FILE
);
...
...
openair2/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-16.4.1.asn1
0 → 100644
View file @
4a8823d4
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
4a8823d4
...
...
@@ -1363,7 +1363,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
sCellDeactivationTimer
=
NULL
;
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
crossCarrierSchedulingConfig
=
NULL
;
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
tag_Id
=
0
;
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
dummy
=
NULL
;
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
dummy
1
=
NULL
;
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
pathlossReferenceLinking
=
NULL
;
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
servingCellMO
=
NULL
;
...
...
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