Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
22
Merge Requests
22
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
oai
openairinterface5G
Commits
fbd5fff7
Commit
fbd5fff7
authored
Oct 27, 2017
by
Cedric Roux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/rrc-rel14-3' into develop_integration_w43
parents
d413de0a
98b5faae
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2091 additions
and
294 deletions
+2091
-294
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-1
cmake_targets/tools/fix_asn1
cmake_targets/tools/fix_asn1
+1
-1
openair2/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e30.asn
openair2/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e30.asn
+2089
-292
No files found.
cmake_targets/CMakeLists.txt
View file @
fbd5fff7
...
...
@@ -291,7 +291,7 @@ elseif (${RRC_ASN1_VERSION} STREQUAL "CBA")
elseif
(
${
RRC_ASN1_VERSION
}
STREQUAL
"Rel10"
)
set
(
RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/LITE/MESSAGES/asn1c/ASN1_files/EUTRA-RRC-Definitions-a20.asn
)
else
()
set
(
RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e
1
0.asn
)
set
(
RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e
3
0.asn
)
endif
(
${
RRC_ASN1_VERSION
}
STREQUAL
"Rel8"
)
set
(
RRC_FULL_DIR
${
asn1_generated_dir
}
/
${
RRC_ASN1_VERSION
}
)
...
...
cmake_targets/tools/fix_asn1
View file @
fbd5fff7
...
...
@@ -4,7 +4,7 @@
# <file> <sha1sum of file (without line 4 which changes depending on the location of the files)> <patch to apply to file>
RRC_Rel14
=(
"SystemInformation-r8-IEs.h"
562e3c3aeb7c6d76d722f31bf24488a26e627f33
"fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
"SystemInformation-r8-IEs.h"
4df485c5ddf2540eca271876cdc512caa19b0890
"fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
)
RRC_Rel10
=(
...
...
openair2/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e
1
0.asn
→
openair2/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e
3
0.asn
View file @
fbd5fff7
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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