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
zzha zzha
OpenXG-RAN
Commits
c254ce07
Commit
c254ce07
authored
May 14, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a unnotified conflict resolved
parent
a81eafd0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+1
-2
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+3
-2
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
c254ce07
...
...
@@ -85,8 +85,7 @@ void config_common(int Mod_idP,
uint64_t
ssb_pattern
,
uint16_t
ssb_periodicity
,
uint64_t
dl_CarrierFreqP
,
uint32_t
dl_BandwidthP
){
uint32_t
dl_BandwidthP
){
nfapi_nr_config_request_t
*
cfg
=
&
RC
.
nrmac
[
Mod_idP
]
->
config
[
CC_idP
];
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
c254ce07
...
...
@@ -41,6 +41,7 @@ void config_common(int Mod_idP,
int
Nid_cell
,
int
nr_bandP
,
uint64_t
ssb_pattern
,
uint16_t
ssb_periodicity
,
uint64_t
dl_CarrierFreqP
,
uint32_t
dl_BandwidthP
);
...
...
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