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
canghaiwuhen
OpenXG-RAN
Commits
af4242c6
Commit
af4242c6
authored
Aug 29, 2019
by
Florian Kaltenberger
Committed by
Wang Tsu-Han
Sep 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
temporary workaround for real-time issues
Conflicts: openair2/GNB_APP/gnb_config.c
parent
b2275c7b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
executables/nr-gnb.c
executables/nr-gnb.c
+2
-2
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+4
-5
No files found.
executables/nr-gnb.c
View file @
af4242c6
...
@@ -108,8 +108,8 @@ extern openair0_config_t openair0_cfg[MAX_CARDS];
...
@@ -108,8 +108,8 @@ extern openair0_config_t openair0_cfg[MAX_CARDS];
extern
int
transmission_mode
;
extern
int
transmission_mode
;
uint16_t
sl_ahead
=
4
;
uint16_t
sl_ahead
=
6
;
uint16_t
sf_ahead
=
4
;
uint16_t
sf_ahead
=
6
;
//pthread_t main_gNB_thread;
//pthread_t main_gNB_thread;
time_stats_t
softmodem_stats_mt
;
// main thread
time_stats_t
softmodem_stats_mt
;
// main thread
...
...
openair2/GNB_APP/gnb_config.c
View file @
af4242c6
...
@@ -808,11 +808,10 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
...
@@ -808,11 +808,10 @@ void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
}
}
NRRRC_CONFIGURATION_REQ
(
msg_p
).
N_RB_DL
[
j
]
=
N_RB_DL
;
NRRRC_CONFIGURATION_REQ
(
msg_p
).
N_RB_DL
[
j
]
=
N_RB_DL
;
if
(
N_RB_DL
==
217
)
sf_ahead
=
2
;
//if(N_RB_DL == 217) sf_ahead = 2;
else
if
(
N_RB_DL
==
106
)
sf_ahead
=
4
;
//else if(N_RB_DL == 106) sf_ahead = 4;
else
sf_ahead
=
4
;
if
((
N_RB_DL
!=
217
)
&&
(
N_RB_DL
!=
106
))
/*else AssertFatal (0,"Failed to parse gNB configuration file %s, gnb %d unknown value \"%d\" for N_RB_DL choice: 106, 217 !\n",
AssertFatal
(
0
,
"Failed to parse gNB configuration file %s, gnb %d unknown value
\"
%d
\"
for N_RB_DL choice: 106, 217 !
\n
"
,
RC
.
config_file_name
,
i
,
N_RB_DL
);
RC.config_file_name, i, N_RB_DL);*/
/*
/*
if ((N_RB_DL!=6) && (N_RB_DL!=15) && (N_RB_DL!=25) && (N_RB_DL!=50) && (N_RB_DL!=75) && (N_RB_DL!=100)) {
if ((N_RB_DL!=6) && (N_RB_DL!=15) && (N_RB_DL!=25) && (N_RB_DL!=50) && (N_RB_DL!=75) && (N_RB_DL!=100)) {
...
...
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